diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..4a3b5c36
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+* text=auto !eol
+*.pp gitlab-language=pascal
+*.inc gitlab-language=pascal
+*.pp diff=pascal
+*.pas diff=pascal
+*.inc diff=pascal
diff --git a/.gitfpcblockedhashes b/.gitfpcblockedhashes
new file mode 100644
index 00000000..e69de29b
diff --git a/.gitfpceligiblesvnhashes b/.gitfpceligiblesvnhashes
new file mode 100644
index 00000000..c0870818
--- /dev/null
+++ b/.gitfpceligiblesvnhashes
@@ -0,0 +1,20 @@
+ab918b97e2bf1b1c3534e01d22cc37f4fc43846c
+db4bc2103094ab27e90dba70a7e831798d8ffe0a
+98a7231bd3d09af6ac7c112e6163835c6f0816c3
+8b6f844abb34ff4916d30a6cc1de3a2ae359acf8
+0265bca02790eda8d3f6f3e9d70757a0c82f1618
+0b37ca48206e7373f6f82db3130018ac1eb21e46
+614ec19bece6cb979e266afb000b33e7e851a5b4
+7085eea5073feaa4a5a98913eecdc8c9453b8ea9
+a04134b134bd645cb79d35812f90ee6df6661e3e
+00ca849325f654716b1a2db79637f9102ef15a4b
+71488e4de71f84a28abc3dd5d61163ef04e33988
+308ceef87b190c2bae06a26ac473d6e4b97d5d0c
+38b9c448137a7cf62faa9a08e574aa0083ed8322
+9653812862e687d95ea5281119b1e367cbe62111
+bf231cbafefd0d26ad5f4bf3903f6ab8ed8adde3
+e1926e813b2de4f10ac3d79cf2f3b6a0b46b420d
+10871653e40dbe1b4ddccfe0f926b2ccfdc83116
+e6a6006b9b7b71a5eb31a76a720a7ad66796f02a
+45deed2329abfa21ee17f61379b6d8311b5b8acc
+31c4131240e5bb168ca75df11828630bf54262bb
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..579c6d53
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,29 @@
+# This .gitlab.ci.yml is based on:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
+# the FPC specific parts are partly from:
+# https://gitlab.com/alb42/testconversion2/-/blob/main/.gitlab-ci.yml
+
+image: registry.gitlab.com/freepascal.org/fpc/source/debian-buster-x86_64
+
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+stages:
+  - build-and-deploy
+ 
+build-job:
+  stage: build-and-deploy
+  artifacts:
+        name: "$CI_BUILD"
+        paths:
+            - fpc-*.tar
+        when: always
+        expire_in: 14 days
+  script:
+    - make -j 4 all OS_TARGET=linux CPU_TARGET=x86_64 FPMAKEOPT="-T 4" 
+    - cd fpcdocs
+    - make pdftar > docs.log
+    - tail docs.log
+    - cd ..
+    - cp fpcdocs/doc-pdf.tar.gz .
+    - install/makepack
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..35687f49
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,8 @@
+[submodule "fpcsrc"]
+	path = fpcsrc
+	url = https://gitlab.com/freepascal.org/fpc/source.git
+	branch = fixes_3_2
+[submodule "fpcdocs"]
+	path = fpcdocs
+	url = https://gitlab.com/freepascal.org/fpc/documentation.git
+	branch = main
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..ff4abe6c
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,366 @@
+This is the file COPYING.FPC, it applies to the Free Pascal Run-Time Library 
+(RTL) and packages (packages) distributed by members of the Free Pascal 
+Development Team.
+
+The source code of the Free Pascal Runtime Libraries and packages are 
+distributed under the Library GNU General Public License 
+(see the file COPYING) with the following modification:
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent modules,
+and to copy and distribute the resulting executable under terms of your choice,
+provided that you also meet, for each linked independent module, the terms
+and conditions of the license of that module. An independent module is a module
+which is not derived from or based on this library. If you modify this
+library, you may extend this exception to your version of the library, but you are
+not obligated to do so. If you do not wish to do so, delete this exception
+statement from your version.
+
+If you didn't receive a copy of the file COPYING, contact:
+      Free Software Foundation
+      675 Mass Ave
+      Cambridge, MA  02139
+      USA
+
+The compiler itself is licensed under the GPL V2:
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    testconversion
+    Copyright (C) 2021  FPC
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    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.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/Makefile b/Makefile
index bcccf188..8131b0be 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: help
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-android aarch64-ios wasm32-embedded wasm32-wasi sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -196,6 +196,24 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
+ifeq ($(FULL_TARGET),xtensa-embedded)
+ifeq ($(SUBARCH),)
+$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
+endif
+override FPCOPT+=-Cp$(SUBARCH)
+endif
+ifeq ($(FULL_TARGET),xtensa-freertos)
+ifeq ($(SUBARCH),)
+$(error When compiling for xtensa-freertos, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
+endif
+override FPCOPT+=-Cp$(SUBARCH)
+endif
+ifeq ($(FULL_TARGET),arm-freertos)
+ifeq ($(SUBARCH),)
+$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBARCH=armv6m or SUBARCH=armv7em) must be defined)
+endif
+override FPCOPT+=-Cp$(SUBARCH)
+endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
@@ -269,8 +287,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -330,7 +348,7 @@ FPCFPMAKE=$(FPC)
 endif
 endif
 override PACKAGE_NAME=fpc
-override PACKAGE_VERSION=3.3.1
+override PACKAGE_VERSION=3.2.3
 BS_FPC_VERSION:=$(FPC_VERSION)
 FPC_VERSION:=$(firstword $(subst -, ,$(PACKAGE_VERSION)))
 ifneq ($(wildcard install),)
@@ -436,12 +454,15 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
+ifeq ($(FULL_TARGET),m68k-sinclairql)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
@@ -451,7 +472,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -529,9 +550,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_DIRS+=fpcsrc fpcdocs
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
@@ -553,6 +571,12 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
+ifeq ($(FULL_TARGET),arm-freertos)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
+ifeq ($(FULL_TARGET),arm-ios)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
@@ -586,6 +610,9 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
+ifeq ($(FULL_TARGET),mips64el-linux)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
 ifeq ($(FULL_TARGET),jvm-java)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
@@ -604,13 +631,25 @@ endif
 ifeq ($(FULL_TARGET),aarch64-linux)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
+ifeq ($(FULL_TARGET),aarch64-freebsd)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
+ifeq ($(FULL_TARGET),aarch64-win64)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
+ifeq ($(FULL_TARGET),aarch64-ios)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
+ifeq ($(FULL_TARGET),wasm32-embedded)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
+ifeq ($(FULL_TARGET),wasm32-wasi)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
 ifeq ($(FULL_TARGET),sparc64-linux)
@@ -628,9 +667,27 @@ endif
 ifeq ($(FULL_TARGET),riscv64-embedded)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
+ifeq ($(FULL_TARGET),xtensa-linux)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
 ifeq ($(FULL_TARGET),xtensa-embedded)
 override TARGET_DIRS+=fpcsrc fpcdocs
 endif
+ifeq ($(FULL_TARGET),xtensa-freertos)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
+ifeq ($(FULL_TARGET),z80-embedded)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
+ifeq ($(FULL_TARGET),z80-zxspectrum)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
+ifeq ($(FULL_TARGET),z80-msxdos)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
+ifeq ($(FULL_TARGET),z80-amstradcpc)
+override TARGET_DIRS+=fpcsrc fpcdocs
+endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -828,6 +885,90 @@ endif
 else
 CROSSBINDIR=
 endif
+ifeq ($(OS_SOURCE),linux)
+ifndef GCCLIBDIR
+ifeq ($(CPU_TARGET),i386)
+ifneq ($(findstring x86_64,$(shell uname -a)),)
+ifeq ($(BINUTILSPREFIX),)
+GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
+ifeq ($(CPU_TARGET),powerpc)
+ifeq ($(BINUTILSPREFIX),)
+GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+else
+CROSSGCCOPT=-m32
+endif
+endif
+ifeq ($(CPU_TARGET),powerpc64)
+ifeq ($(BINUTILSPREFIX),)
+GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
+else
+CROSSGCCOPT=-m64
+endif
+endif
+ifeq ($(CPU_TARGET),sparc)
+ifneq ($(findstring sparc64,$(shell uname -a)),)
+ifeq ($(BINUTILSPREFIX),)
+GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+else
+ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+CROSSGCCOPT=-mabi=32
+else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
+endif
+endif
+ifdef FPCFPMAKE
+FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+else
+ifneq ($(findstring $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
+FPCMAKE_CROSSGCCOPT=-m64
+else
+ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+FPCMAKE_CROSSGCCOPT=-mabi=64
+else
+ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+FPCMAKE_CROSSGCCOPT=-mabi=32
+else
+ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),)
+FPCMAKE_CROSSGCCOPT=-mabi=lp64
+else
+ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),)
+FPCMAKE_CROSSGCCOPT=-mabi=ilp32
+else
+FPCMAKE_CROSSGCCOPT=-m32
+endif
+endif
+endif
+endif
+endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`)
+endif
+endif
+ifndef FPCMAKEGCCLIBDIR
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
+endif
+ifndef GCCLIBDIR
+CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
+ifneq ($(CROSSGCC),)
+GCCLIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc-file-name`)
+endif
+endif
+endif
+ifdef inUnix
+ifeq ($(OS_SOURCE),netbsd)
+OTHERLIBDIR:=/usr/pkg/lib
+endif
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
+endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
@@ -972,14 +1113,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1029,6 +1170,11 @@ STATICLIBPREFIX=
 STATICLIBEXT=.a
 SHORTSUFFIX=d16
 endif
+ifeq ($(OS_TARGET),msxdos)
+STATICLIBPREFIX=
+STATICLIBEXT=.a
+SHORTSUFFIX=msd
+endif
 ifeq ($(OS_TARGET),embedded)
 ifeq ($(CPU_TARGET),i8086)
 STATICLIBPREFIX=
@@ -1036,6 +1182,9 @@ STATICLIBEXT=.a
 else
 EXEEXT=.bin
 endif
+ifeq ($(CPU_TARGET),z80)
+OEXT=.rel
+endif
 SHORTSUFFIX=emb
 endif
 ifeq ($(OS_TARGET),win16)
@@ -1044,6 +1193,9 @@ STATICLIBEXT=.a
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=w16
 endif
+ifeq ($(OS_TARGET),zxspectrum)
+OEXT=.rel
+endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 ZIPSUFFIX=$(SHORTSUFFIX)
@@ -1315,11 +1467,11 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-endif
-ifneq ($(BINUTILSPREFIX),)
+ifneq ($(RLINKPATH),)
 override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
+endif
 ifndef CROSSCOMPILE
 ifneq ($(BINUTILSPREFIX),)
 override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
@@ -1349,16 +1501,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1410,16 +1553,40 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
 override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
 endif
 endif
+ifdef SYSROOTPATH
+override FPCOPT+=-XR$(SYSROOTPATH)
+else
+ifeq ($(OS_TARGET),$(OS_SOURCE))
+ifneq ($(findstring $(OS_TARGET),darwin),)
+ifneq ($(findstring $(CPU_TARGET),aarch64),)
+ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk),)
+override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
+endif
+endif
+endif
+endif
+endif
 ifdef CREATESHARED
 override FPCOPT+=-Cg
 endif
 ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
-ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)
+ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel riscv64),)
 override FPCOPT+=-Cg
 endif
 endif
 ifdef LINKSHARED
 endif
+ifdef GCCLIBDIR
+override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
+override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
+endif
+endif
+ifdef OTHERLIBDIR
+override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
+endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -1931,7 +2098,7 @@ ifeq ($(FULL_TARGET),m68k-palmos)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
@@ -1939,6 +2106,10 @@ ifeq ($(FULL_TARGET),m68k-embedded)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
+ifeq ($(FULL_TARGET),m68k-sinclairql)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
@@ -1951,7 +2122,7 @@ ifeq ($(FULL_TARGET),powerpc-amiga)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
@@ -2055,10 +2226,6 @@ ifeq ($(FULL_TARGET),arm-palmos)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_DIRS_FPCSRC=1
-TARGET_DIRS_FPCDOCS=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
@@ -2087,6 +2254,14 @@ ifeq ($(FULL_TARGET),arm-aros)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
+ifeq ($(FULL_TARGET),arm-freertos)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
+ifeq ($(FULL_TARGET),arm-ios)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
@@ -2131,6 +2306,10 @@ ifeq ($(FULL_TARGET),mipsel-android)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
+ifeq ($(FULL_TARGET),mips64el-linux)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
 ifeq ($(FULL_TARGET),jvm-java)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
@@ -2155,15 +2334,31 @@ ifeq ($(FULL_TARGET),aarch64-linux)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
+ifeq ($(FULL_TARGET),aarch64-freebsd)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
+ifeq ($(FULL_TARGET),aarch64-win64)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
 ifeq ($(FULL_TARGET),aarch64-android)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
+ifeq ($(FULL_TARGET),aarch64-ios)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
+ifeq ($(FULL_TARGET),wasm32-embedded)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
+ifeq ($(FULL_TARGET),wasm32-wasi)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
@@ -2187,10 +2382,34 @@ ifeq ($(FULL_TARGET),riscv64-embedded)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
+ifeq ($(FULL_TARGET),xtensa-linux)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
 ifeq ($(FULL_TARGET),xtensa-embedded)
 TARGET_DIRS_FPCSRC=1
 TARGET_DIRS_FPCDOCS=1
 endif
+ifeq ($(FULL_TARGET),xtensa-freertos)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
+ifeq ($(FULL_TARGET),z80-embedded)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
+ifeq ($(FULL_TARGET),z80-zxspectrum)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
+ifeq ($(FULL_TARGET),z80-msxdos)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
+ifeq ($(FULL_TARGET),z80-amstradcpc)
+TARGET_DIRS_FPCSRC=1
+TARGET_DIRS_FPCDOCS=1
+endif
 ifdef TARGET_DIRS_FPCSRC
 fpcsrc_all:
 	$(MAKE) -C fpcsrc all
@@ -2321,6 +2540,7 @@ help:
 	@$(ECHO)    deb         Build linux .deb packages
 	@$(ECHO)    inno        "Build Windows (Innosetup) based installer"
 	@$(ECHO)    innox64     "Build Win32-Win64 cross compiler installer"
+	@$(ECHO)    innox86x64  "Build Windows (Innosetup) combined installer for Win32 and Win64"
 	@$(ECHO)    innoce      "Build Win32-Wince cross compiler installer"
 	@$(ECHO)    innomsdos   "Build Win32-MsDos cross compiler installer"
 	@$(ECHO)    innoandroid "Build Win32-Android cross compiler installer"
@@ -2372,6 +2592,7 @@ ifeq ($(OS_TARGET),wince)
 endif
 ifeq ($(OS_TARGET),win64)
 	$(COPY) $(addprefix $(CVSINSTALL)/crossbinw64/, *.exe) $(INSTALL_BINDIR)
+	-$(COPY) $(CVSINSTALL)/binw32/gcc.exe $(INSTALL_BINDIR)/x86_64-win64-gcc.exe	
 endif
 ifeq ($(OS_TARGET),msdos)
 	$(COPY) $(addprefix $(CVSINSTALL)/crossbinmsdos/, *.exe) $(INSTALL_BINDIR)
@@ -2393,6 +2614,7 @@ ifeq ($(OS_TARGET),win32)
 endif
 ifeq ($(OS_TARGET),win64)
 	-$(COPY) $(addprefix $(CVSINSTALL)/binw64/,*.ico *.exe *.dll *.h *.manifest) $(INSTALL_BINDIR)
+	-$(COPY) $(CVSINSTALL)/binw32/gcc.exe $(INSTALL_BINDIR)/x86_64-win64-gcc.exe
 endif
 endif
 ifeq ($(OS_TARGET),os2)
@@ -2413,7 +2635,8 @@ endif
 install: $(BUILDSTAMP)
 	$(MAKE) installbase
 	$(MAKE) -C fpcsrc installother
-crossinstall: $(BUILDSTAMP)
+crossinstall: 
+	$(MAKE) $(BUILDSTAMP) CROSSINSTALL=1
 	$(MAKE) installbase CROSSINSTALL=1
 	$(MAKE) -C fpcsrc installother CROSSINSTALL=1
 zipinstall: $(BUILDSTAMP)
@@ -2425,10 +2648,12 @@ ifeq ($(FULL_SOURCE),$(FULL_TARGET))
 else
 	$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX).built.on.$(SOURCESUFFIX)
 endif
-crosszipinstall: $(BUILDSTAMP)
+crosszipinstall:
+	$(MAKE) $(BUILDSTAMP) CROSSINSTALL=1
 	$(MAKE) fpc_zipinstall CROSSINSTALL=1 ZIPTARGET=installbase ZIPNAME=base
 	$(MAKE) -C fpcsrc zipinstallother CROSSINSTALL=1
-crosssinglezipinstall: $(BUILDSTAMP)
+crosssinglezipinstall:
+	$(MAKE) $(BUILDSTAMP) CROSSINSTALL=1
 	$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(SOURCESUFFIX).cross.$(TARGETSUFFIX) CROSSINSTALL=1
 .PHONY: docspdf makepackdocs docsrcinstall docsrc
 DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs
@@ -2487,188 +2712,192 @@ sunoszip: checkfpcdir
 	$(MAKE) zipinstall OS_TARGET=sunos TARPROG=gtar
 .PHONY: renametoshort shortsrc shortbin shortnames
 renametoshort:
-	-mv $(PKGPRE)base$(ZIPSUFFIX).zip base$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)installer$(ZIPSUFFIX).zip inst$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)asld$(ZIPSUFFIX).zip asld$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)make$(ZIPSUFFIX).zip make$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)gdb$(ZIPSUFFIX).zip gdb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)a52$(ZIPSUFFIX).zip ua52$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ami-extra$(ZIPSUFFIX).zip uami$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)amunits$(ZIPSUFFIX).zip uamu$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)arosunits$(ZIPSUFFIX).zip uaru$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)aspell$(ZIPSUFFIX).zip uasp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)bfd$(ZIPSUFFIX).zip ubfd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)bzip2$(ZIPSUFFIX).zip ubz2$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)cairo$(ZIPSUFFIX).zip ucai$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)cdrom$(ZIPSUFFIX).zip ucdr$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)chm$(ZIPSUFFIX).zip uchm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)cocoaint$(ZIPSUFFIX).zip ucoc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)dblib$(ZIPSUFFIX).zip udblb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)dbus$(ZIPSUFFIX).zip udbus$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)dts$(ZIPSUFFIX).zip udts$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fastcgi$(ZIPSUFFIX).zip ufcgi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-async$(ZIPSUFFIX).zip ufcla$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-base$(ZIPSUFFIX).zip ufclb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-db$(ZIPSUFFIX).zip ufcld$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-extra$(ZIPSUFFIX).zip ufcex$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-fpcunit$(ZIPSUFFIX).zip ufclu$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-image$(ZIPSUFFIX).zip ufcli$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-js$(ZIPSUFFIX).zip ufcjs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-json$(ZIPSUFFIX).zip ufclj$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-net$(ZIPSUFFIX).zip ufcln$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-passrc$(ZIPSUFFIX).zip ufcls$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-pdf$(ZIPSUFFIX).zip ufcpd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-process$(ZIPSUFFIX).zip ufclp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-registry$(ZIPSUFFIX).zip ufclr$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-report$(ZIPSUFFIX).zip ufcre$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-res$(ZIPSUFFIX).zip ufcle$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-sdo$(ZIPSUFFIX).zip ufcsd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-sound$(ZIPSUFFIX).zip ufsnd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-stl$(ZIPSUFFIX).zip ufcst$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-web$(ZIPSUFFIX).zip ufclw$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-xml$(ZIPSUFFIX).zip ufclx$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fftw$(ZIPSUFFIX).zip ufftw$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fpc-all$(ZIPSUFFIX).zip ufpca$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fpgtk$(ZIPSUFFIX).zip ufpgt$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fpindexer$(ZIPSUFFIX).zip ufpi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fpmkunit$(ZIPSUFFIX).zip ufpmk$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fppkg$(ZIPSUFFIX).zip ufppk$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fuse$(ZIPSUFFIX).zip ufuse$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fv$(ZIPSUFFIX).zip ufv$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gdbint$(ZIPSUFFIX).zip ugdb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gdbm$(ZIPSUFFIX).zip ugdbm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ggi$(ZIPSUFFIX).zip uggi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gmp$(ZIPSUFFIX).zip ugmp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gnome1$(ZIPSUFFIX).zip ugno1$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gnutls$(ZIPSUFFIX).zip ugtls$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)googleapi$(ZIPSUFFIX).zip ugapi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)graph$(ZIPSUFFIX).zip ugrph$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gtk1$(ZIPSUFFIX).zip ugtk1$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gtk2$(ZIPSUFFIX).zip ugtk2$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)hash$(ZIPSUFFIX).zip uhash$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)hermes$(ZIPSUFFIX).zip uherm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)httpd13$(ZIPSUFFIX).zip uhd13$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)httpd20$(ZIPSUFFIX).zip uhd20$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)httpd22$(ZIPSUFFIX).zip uhd22$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)httpd24$(ZIPSUFFIX).zip uhd24$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ibase$(ZIPSUFFIX).zip uibas$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)iconvenc$(ZIPSUFFIX).zip uicve$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ide$(ZIPSUFFIX).zip uide$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)imagemagick$(ZIPSUFFIX).zip uimgm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)imlib$(ZIPSUFFIX).zip uimlb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)iosxlocale$(ZIPSUFFIX).zip uiosl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)jni$(ZIPSUFFIX).zip ujni$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ldap$(ZIPSUFFIX).zip uldap$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libc$(ZIPSUFFIX).zip ulibc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libcups$(ZIPSUFFIX).zip ulcup$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libcurl$(ZIPSUFFIX).zip ulcur$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libenet$(ZIPSUFFIX).zip ulnet$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libffi$(ZIPSUFFIX).zip ulffi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libfontconfig$(ZIPSUFFIX).zip ulfcg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libgbafpc$(ZIPSUFFIX).zip ulgba$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libgc$(ZIPSUFFIX).zip ulgc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libgd$(ZIPSUFFIX).zip ulgd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libmagic$(ZIPSUFFIX).zip ulmag$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libmicrohttpd$(ZIPSUFFIX).zip ulmic$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libndsfpc$(ZIPSUFFIX).zip ulnds$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libogcfpc$(ZIPSUFFIX).zip ulogc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libpng$(ZIPSUFFIX).zip ulpng$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libsee$(ZIPSUFFIX).zip ulsee$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libtar$(ZIPSUFFIX).zip ultar$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libusb$(ZIPSUFFIX).zip ulusb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libvlc$(ZIPSUFFIX).zip ulvlc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libxml2$(ZIPSUFFIX).zip ulxml$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)lua$(ZIPSUFFIX).zip ulua$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)mad$(ZIPSUFFIX).zip umad$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)matroska$(ZIPSUFFIX).zip umatk$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)modplug$(ZIPSUFFIX).zip umplg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)morphunits$(ZIPSUFFIX).zip umrph$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)mysql$(ZIPSUFFIX).zip umysq$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ncurses$(ZIPSUFFIX).zip uncrs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)newt$(ZIPSUFFIX).zip unewt$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)numlib$(ZIPSUFFIX).zip unlib$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)nvapi$(ZIPSUFFIX).zip unva$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)objcrtl$(ZIPSUFFIX).zip uobjc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)odata$(ZIPSUFFIX).zip uodat$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)odbc$(ZIPSUFFIX).zip uodbc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)oggvorbis$(ZIPSUFFIX).zip uoggv$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)openal$(ZIPSUFFIX).zip uoal$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)opencl$(ZIPSUFFIX).zip uocl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)opengl$(ZIPSUFFIX).zip uogl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)opengles$(ZIPSUFFIX).zip uogls$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)openssl$(ZIPSUFFIX).zip uossl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)oracle$(ZIPSUFFIX).zip uora$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)os2units$(ZIPSUFFIX).zip uos2$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)os4units$(ZIPSUFFIX).zip uos4$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)palmunits$(ZIPSUFFIX).zip upalm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pasjpeg$(ZIPSUFFIX).zip upjp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pastojs$(ZIPSUFFIX).zip up2js$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)paszlib$(ZIPSUFFIX).zip upzl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pcap$(ZIPSUFFIX).zip upcap$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)postgres$(ZIPSUFFIX).zip upgr$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)proj4$(ZIPSUFFIX).zip uprj4$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ptc$(ZIPSUFFIX).zip uptc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pthreads$(ZIPSUFFIX).zip upthr$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pxlib$(ZIPSUFFIX).zip upxl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)regexpr$(ZIPSUFFIX).zip ureg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rexx$(ZIPSUFFIX).zip urexx$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rsvg$(ZIPSUFFIX).zip ursvg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-console$(ZIPSUFFIX).zip urtlc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-extra$(ZIPSUFFIX).zip urtle$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-generics$(ZIPSUFFIX).zip urtlg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-objpas$(ZIPSUFFIX).zip urtlo$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-unicode$(ZIPSUFFIX).zip urtlu$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)sdl$(ZIPSUFFIX).zip usdl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)sndfile$(ZIPSUFFIX).zip usndf$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)sqlite$(ZIPSUFFIX).zip usqlt$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)svgalib$(ZIPSUFFIX).zip usvga$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)symbolic$(ZIPSUFFIX).zip usymb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)syslog$(ZIPSUFFIX).zip usysl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)tcl$(ZIPSUFFIX).zip utcl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)tosunits$(ZIPSUFFIX).zip utos$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)univint$(ZIPSUFFIX).zip uuniv$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)unixutil$(ZIPSUFFIX).zip uunix$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)unzip$(ZIPSUFFIX).zip uzip$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)users$(ZIPSUFFIX).zip uuser$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)utmp$(ZIPSUFFIX).zip uutmp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)uuid$(ZIPSUFFIX).zip uuuid$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)vcl-compat$(ZIPSUFFIX).zip uvcl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)webidl$(ZIPSUFFIX).zip uwidl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)winceunits$(ZIPSUFFIX).zip uwice$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)winunits-base$(ZIPSUFFIX).zip uwib$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)winunits-jedi$(ZIPSUFFIX).zip uwij$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)x11$(ZIPSUFFIX).zip ux11$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)xforms$(ZIPSUFFIX).zip uxfrm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)zlib$(ZIPSUFFIX).zip uzlib$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)zorba$(ZIPSUFFIX).zip uzorb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils$(ZIPSUFFIX).zip utils$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-debugsrv$(ZIPSUFFIX).zip udbgs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-dxegen$(ZIPSUFFIX).zip udxeg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpcm$(ZIPSUFFIX).zip ufpcm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpcmkcfg$(ZIPSUFFIX).zip ufpck$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpcres$(ZIPSUFFIX).zip ufprs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpcreslipo$(ZIPSUFFIX).zip ufprl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpdoc$(ZIPSUFFIX).zip ufpdc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpmc$(ZIPSUFFIX).zip ufpmc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fppkg$(ZIPSUFFIX).zip ufpkg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fprcp$(ZIPSUFFIX).zip ufprc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-h2pas$(ZIPSUFFIX).zip uh2pa$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-importtl$(ZIPSUFFIX).zip uimpt$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-instantfpc$(ZIPSUFFIX).zip uifpc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-javaapp$(ZIPSUFFIX).zip ujvp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-json2pas$(ZIPSUFFIX).zip ujs2p$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-lexyacc$(ZIPSUFFIX).zip ulexy$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-mksymbian$(ZIPSUFFIX).zip umksb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-pas2fpm$(ZIPSUFFIX).zip up2fp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-pas2jni$(ZIPSUFFIX).zip up2jn$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-pas2js$(ZIPSUFFIX).zip uupjs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-pas2ut$(ZIPSUFFIX).zip up2ut$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-rmwait$(ZIPSUFFIX).zip urmw$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-sim_pasc$(ZIPSUFFIX).zip usmp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-svn2cvs$(ZIPSUFFIX).zip us2c$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-unicode$(ZIPSUFFIX).zip uucd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)rtl$(ZIPSUFFIX).zip rtl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)base$(ZIPSUFFIX).zip base$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)installer$(ZIPSUFFIX).zip inst$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)asld$(ZIPSUFFIX).zip asld$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)make$(ZIPSUFFIX).zip make$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)gdb$(ZIPSUFFIX).zip gdb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)a52$(ZIPSUFFIX).zip ua52$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ami-extra$(ZIPSUFFIX).zip uami$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)amunits$(ZIPSUFFIX).zip uamu$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)arosunits$(ZIPSUFFIX).zip uaru$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)aspell$(ZIPSUFFIX).zip uasp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)bfd$(ZIPSUFFIX).zip ubfd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)bzip2$(ZIPSUFFIX).zip ubz2$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)cairo$(ZIPSUFFIX).zip ucai$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)cdrom$(ZIPSUFFIX).zip ucdr$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)chm$(ZIPSUFFIX).zip uchm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)cocoaint$(ZIPSUFFIX).zip ucoc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)dblib$(ZIPSUFFIX).zip udblb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)dbus$(ZIPSUFFIX).zip udbus$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)dts$(ZIPSUFFIX).zip udts$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fastcgi$(ZIPSUFFIX).zip ufcgi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-async$(ZIPSUFFIX).zip ufcla$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-base$(ZIPSUFFIX).zip ufclb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-db$(ZIPSUFFIX).zip ufcld$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-extra$(ZIPSUFFIX).zip ufcex$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-fpcunit$(ZIPSUFFIX).zip ufclu$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-image$(ZIPSUFFIX).zip ufcli$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-js$(ZIPSUFFIX).zip ufcjs$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-json$(ZIPSUFFIX).zip ufclj$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-net$(ZIPSUFFIX).zip ufcln$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-passrc$(ZIPSUFFIX).zip ufcls$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-pdf$(ZIPSUFFIX).zip ufcpd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-process$(ZIPSUFFIX).zip ufclp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-registry$(ZIPSUFFIX).zip ufclr$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-report$(ZIPSUFFIX).zip ufpre$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-res$(ZIPSUFFIX).zip ufcle$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-sdo$(ZIPSUFFIX).zip ufcsd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-sound$(ZIPSUFFIX).zip ufsnd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-stl$(ZIPSUFFIX).zip ufcst$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-web$(ZIPSUFFIX).zip ufclw$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-xml$(ZIPSUFFIX).zip ufclx$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fftw$(ZIPSUFFIX).zip ufftw$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fpc-all$(ZIPSUFFIX).zip ufpca$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fpgtk$(ZIPSUFFIX).zip ufpgt$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fpindexer$(ZIPSUFFIX).zip ufpi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fpmkunit$(ZIPSUFFIX).zip ufpmk$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fppkg$(ZIPSUFFIX).zip ufppk$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fuse$(ZIPSUFFIX).zip ufuse$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fv$(ZIPSUFFIX).zip ufv$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gdbint$(ZIPSUFFIX).zip ugdb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gdbm$(ZIPSUFFIX).zip ugdbm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ggi$(ZIPSUFFIX).zip uggi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gmp$(ZIPSUFFIX).zip ugmp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gnome1$(ZIPSUFFIX).zip ugno1$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gnutls$(ZIPSUFFIX).zip ugtls$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)googleapi$(ZIPSUFFIX).zip ugapi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)graph$(ZIPSUFFIX).zip ugrph$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gtk1$(ZIPSUFFIX).zip ugtk1$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gtk2$(ZIPSUFFIX).zip ugtk2$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)hash$(ZIPSUFFIX).zip uhash$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)hermes$(ZIPSUFFIX).zip uherm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)httpd13$(ZIPSUFFIX).zip uhd13$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)httpd20$(ZIPSUFFIX).zip uhd20$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)httpd22$(ZIPSUFFIX).zip uhd22$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)httpd24$(ZIPSUFFIX).zip uhd24$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ibase$(ZIPSUFFIX).zip uibas$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)iconvenc$(ZIPSUFFIX).zip uicve$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ide$(ZIPSUFFIX).zip uide$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)imagemagick$(ZIPSUFFIX).zip uimgm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)imlib$(ZIPSUFFIX).zip uimlb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)iosxlocale$(ZIPSUFFIX).zip uiosl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)jni$(ZIPSUFFIX).zip ujni$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ldap$(ZIPSUFFIX).zip uldap$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libc$(ZIPSUFFIX).zip ulibc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libcups$(ZIPSUFFIX).zip ulcup$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libcurl$(ZIPSUFFIX).zip ulcur$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libenet$(ZIPSUFFIX).zip ulnet$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libffi$(ZIPSUFFIX).zip ulffi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libfontconfig$(ZIPSUFFIX).zip ulfcg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libgbafpc$(ZIPSUFFIX).zip ulgba$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libgc$(ZIPSUFFIX).zip ulgc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libgd$(ZIPSUFFIX).zip ulgd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libmagic$(ZIPSUFFIX).zip ulmag$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libmicrohttpd$(ZIPSUFFIX).zip ulmic$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libndsfpc$(ZIPSUFFIX).zip ulnds$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libogcfpc$(ZIPSUFFIX).zip ulogc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libpng$(ZIPSUFFIX).zip ulpng$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libsee$(ZIPSUFFIX).zip ulsee$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libtar$(ZIPSUFFIX).zip ultar$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libusb$(ZIPSUFFIX).zip ulusb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libvlc$(ZIPSUFFIX).zip ulvlc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libxml2$(ZIPSUFFIX).zip ulxml$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)lua$(ZIPSUFFIX).zip ulua$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)mad$(ZIPSUFFIX).zip umad$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)matroska$(ZIPSUFFIX).zip umatk$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)modplug$(ZIPSUFFIX).zip umplg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)morphunits$(ZIPSUFFIX).zip umrph$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)mysql$(ZIPSUFFIX).zip umysq$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ncurses$(ZIPSUFFIX).zip uncrs$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)newt$(ZIPSUFFIX).zip unewt$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)numlib$(ZIPSUFFIX).zip unlib$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)nvapi$(ZIPSUFFIX).zip unva$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)objcrtl$(ZIPSUFFIX).zip uobjc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)odata$(ZIPSUFFIX).zip uodat$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)odbc$(ZIPSUFFIX).zip uodbc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)oggvorbis$(ZIPSUFFIX).zip uoggv$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)openal$(ZIPSUFFIX).zip uoal$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)opencl$(ZIPSUFFIX).zip uocl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)opengl$(ZIPSUFFIX).zip uogl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)opengles$(ZIPSUFFIX).zip uogls$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)openssl$(ZIPSUFFIX).zip uossl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)oracle$(ZIPSUFFIX).zip uora$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)os2units$(ZIPSUFFIX).zip uos2$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)os4units$(ZIPSUFFIX).zip uos4$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)palmunits$(ZIPSUFFIX).zip upalm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pasjpeg$(ZIPSUFFIX).zip upjp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pastojs$(ZIPSUFFIX).zip up2js$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)paszlib$(ZIPSUFFIX).zip upzl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pcap$(ZIPSUFFIX).zip upcap$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)postgres$(ZIPSUFFIX).zip upgr$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)proj4$(ZIPSUFFIX).zip uprj4$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ptc$(ZIPSUFFIX).zip uptc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pthreads$(ZIPSUFFIX).zip upthr$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pxlib$(ZIPSUFFIX).zip upxl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)qlunits$(ZIPSUFFIX).zip uqlun$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)regexpr$(ZIPSUFFIX).zip ureg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rexx$(ZIPSUFFIX).zip urexx$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rsvg$(ZIPSUFFIX).zip ursvg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-console$(ZIPSUFFIX).zip urtlc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-extra$(ZIPSUFFIX).zip urtle$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-generics$(ZIPSUFFIX).zip urtlg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-objpas$(ZIPSUFFIX).zip urtlo$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-unicode$(ZIPSUFFIX).zip urtlu$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)sdl$(ZIPSUFFIX).zip usdl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)sndfile$(ZIPSUFFIX).zip usndf$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)sqlite$(ZIPSUFFIX).zip usqlt$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)svgalib$(ZIPSUFFIX).zip usvga$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)symbolic$(ZIPSUFFIX).zip usymb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)syslog$(ZIPSUFFIX).zip usysl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)tcl$(ZIPSUFFIX).zip utcl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)tosunits$(ZIPSUFFIX).zip utos$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)tplylib$(ZIPSUFFIX).zip utpll$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)univint$(ZIPSUFFIX).zip uuniv$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)unixutil$(ZIPSUFFIX).zip uunix$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)unzip$(ZIPSUFFIX).zip uzip$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)users$(ZIPSUFFIX).zip uuser$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)utmp$(ZIPSUFFIX).zip uutmp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)uuid$(ZIPSUFFIX).zip uuuid$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)vcl-compat$(ZIPSUFFIX).zip uvcl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)webidl$(ZIPSUFFIX).zip uwidl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)winceunits$(ZIPSUFFIX).zip uwice$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)winunits-base$(ZIPSUFFIX).zip uwib$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)winunits-jedi$(ZIPSUFFIX).zip uwij$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)x11$(ZIPSUFFIX).zip ux11$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)xforms$(ZIPSUFFIX).zip uxfrm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)zlib$(ZIPSUFFIX).zip uzlib$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)zorba$(ZIPSUFFIX).zip uzorb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils$(ZIPSUFFIX).zip utils$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-debugsrv$(ZIPSUFFIX).zip dbgs$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-dxegen$(ZIPSUFFIX).zip dxeg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpcm$(ZIPSUFFIX).zip fpcm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpcmkcfg$(ZIPSUFFIX).zip fcmk$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpcres$(ZIPSUFFIX).zip fprs$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpcreslipo$(ZIPSUFFIX).zip fprl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpdoc$(ZIPSUFFIX).zip fpdc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpmc$(ZIPSUFFIX).zip fpmc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fppkg$(ZIPSUFFIX).zip fpkg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fprcp$(ZIPSUFFIX).zip fprc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-h2pas$(ZIPSUFFIX).zip h2pa$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-ihxutil$(ZIPSUFFIX).zip ihxu$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-importtl$(ZIPSUFFIX).zip impt$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-instantfpc$(ZIPSUFFIX).zip ifpc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-javaapp$(ZIPSUFFIX).zip jvp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-json2pas$(ZIPSUFFIX).zip jsnp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-lexyacc$(ZIPSUFFIX).zip tply$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-mksymbian$(ZIPSUFFIX).zip mksb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-pas2fpm$(ZIPSUFFIX).zip p2fp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-pas2jni$(ZIPSUFFIX).zip p2jn$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-pas2js$(ZIPSUFFIX).zip p2js$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-pas2ut$(ZIPSUFFIX).zip p2ut$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-rmwait$(ZIPSUFFIX).zip rmw$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-sim_pasc$(ZIPSUFFIX).zip smp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-svn2cvs$(ZIPSUFFIX).zip s2c$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-unicode$(ZIPSUFFIX).zip ucd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-wasmbin$(ZIPSUFFIX).zip wsbn$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)rtl$(ZIPSUFFIX).zip rtl$(ZIPSUFFIXSHORT).zip
 shortsrc:
 	$(MAKE) renametoshort ZIPSUFFIX=$(ZIPSOURCESUFFIX) ZIPSUFFIXSHORT=src
 	$(MAKE) renametoshort ZIPSUFFIX=-$(FPC_VERSION)$(ZIPSOURCESUFFIX) ZIPSUFFIXSHORT=src
@@ -3074,7 +3303,7 @@ endif
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpc.ist -o $(INNODIR)/fpc.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	$(INNOCMD_ISCC)
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_TARGET).exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_TARGET).exe
 innocebuild: innocheck buildce
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	$(DELTREE) $(INNODIR)
@@ -3084,7 +3313,7 @@ innocebuild: innocheck buildce
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpcce.ist -o $(INNODIR)/fpcce.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcce.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
 innox64build: innocheck buildx64
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	$(DELTREE) $(INNODIR)
@@ -3094,7 +3323,22 @@ innox64build: innocheck buildx64
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpcx64.ist -o $(INNODIR)/fpcx64.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcx64.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
+innox86x64build: innocheck
+	rmcvsdir$(EXEEXT) $(INNODIR)
+	$(DELTREE) $(INNODIR)
+	$(MKDIR) $(INNODIR)
+	$(COPYTREE) demo $(INNODIR)
+	$(COPYTREE) install/unicode $(INNODIR)
+ifndef NODOCS
+	unzip -d $(INNODIR) doc-pdf.zip
+endif
+	$(MAKE) install INSTALL_PREFIX=$(INNODIR)
+	$(MAKE) crossinstall INSTALL_PREFIX=$(INNODIR) OS_TARGET=win64 CPU_TARGET=x86_64
+	rmcvsdir$(EXEEXT) $(INNODIR)
+	fpcmkcfg -t install/fpcx86x64.ist -o $(INNODIR)/fpc.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
+	$(INNOCMD_ISCC)
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).win32.and.win64.exe
 innojvmbuild: innocheck buildjvm
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	$(DELTREE) $(INNODIR)
@@ -3104,10 +3348,12 @@ innojvmbuild: innocheck buildjvm
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpcjvm.ist -o $(INNODIR)/fpcjvm.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcjvm.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(CPU_TARGET).exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(CPU_TARGET).exe
 buildmsdos_subarch_mm: fpcsrc/build-stamp.cross-msdos
-	$(MAKE) -C fpcsrc/rtl clean install OS_TARGET=msdos FPC=ppc8086 CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
-	$(MAKE) -C fpcsrc/packages clean install OS_TARGET=msdos FPC=ppc8086 CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)" FPCFPMAKE=$(BASEDIR)/fpcsrc/compiler/ppc
+	$(MAKE) -C fpcsrc/rtl clean FPC=$(realpath ./fpcsrc/compiler/ppcross8086.exe) OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
+	$(MAKE) -C fpcsrc/rtl install FPC=$(realpath ./fpcsrc/compiler/ppcross8086.exe) OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
+	$(MAKE) -C fpcsrc/packages clean FPC=$(realpath ./fpcsrc/compiler/ppcross8086.exe) OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)" FPCFPMAKE=$(BASEDIR)/fpcsrc/compiler/ppc
+	$(MAKE) -C fpcsrc/packages install FPC=$(realpath ./fpcsrc/compiler/ppcross8086.exe) OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)" FPCFPMAKE=$(BASEDIR)/fpcsrc/compiler/ppc
 	$(MOVE) $(INSTALL_BASEDIR)/units/msdos $(INSTALL_BASEDIR)/units/msdos_/$(SUBARCH)-$(MEMORY_MODEL)
 buildmsdos_subarch:
 	$(MAKE) buildmsdos_subarch_mm MEMORY_MODEL=tiny
@@ -3115,52 +3361,28 @@ buildmsdos_subarch:
 	$(MAKE) buildmsdos_subarch_mm MEMORY_MODEL=medium
 	$(MAKE) buildmsdos_subarch_mm MEMORY_MODEL=compact
 	$(MAKE) buildmsdos_subarch_mm MEMORY_MODEL=large
-ifeq ($(findstring 3.0.,$(FPC_VERSION)),)
 	$(MAKE) buildmsdos_subarch_mm MEMORY_MODEL=huge
-endif
-build_msdos:
-	$(DELTREE) $(INSTALL_BASEDIR)/units/msdos_
-	$(MKDIR) $(INSTALL_BASEDIR)/units/msdos_
-	$(MAKE) buildmsdos_subarch SUBARCH=8086
-	$(MAKE) buildmsdos_subarch SUBARCH=80186
-	$(MAKE) buildmsdos_subarch SUBARCH=80286
-	$(MAKE) buildmsdos_subarch SUBARCH=80386
-	$(MOVE) $(INSTALL_BASEDIR)/units/msdos_ $(INSTALL_BASEDIR)/units/msdos
-buildmsdos_rtl_subarch_mm:
-	$(MAKE) -C fpcsrc/rtl/msdos info clean all FPC=ppc8086 CPU_TARGET=i8086 OS_TARGET=msdos OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
-	$(MAKE) -C fpcsrc/rtl/msdos install FPC=ppc8086 CPU_TARGET=i8086 OS_TARGET=msdos CROSSINSTALL=1 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
-	$(MOVE) $(INSTALL_BASEDIR)/units/msdos $(INSTALL_BASEDIR)/units/msdos_/$(SUBARCH)-$(MEMORY_MODEL)
-buildmsdos_rtl_subarch:
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=tiny CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=small CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=medium CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=compact CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=large CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-ifeq ($(findstring 3.0.,$(FPC_VERSION)),)
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=huge CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-endif
-buildmsdos_rtl: fpcsrc/build-stamp.cross-msdos
-	$(DELTREE) $(INSTALL_BASEDIR)/units/msdos_
-	$(MKDIR) $(INSTALL_BASEDIR)/units/msdos_
-	$(MAKE) buildmsdos_rtl_subarch SUBARCH=8086 CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch SUBARCH=80186 CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch SUBARCH=80286 CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch SUBARCH=80386 CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MOVE) $(INSTALL_BASEDIR)/units/msdos_ $(INSTALL_BASEDIR)/units/msdos
 innomsdosbuild: innocheck
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	$(DELTREE) $(INNODIR)
 	$(MKDIR) $(INNODIR)
 	$(COPYTREE) demo $(INNODIR)
+	$(MKDIR) $(INNODIR)/doc
+	$(MKDIR) $(INNODIR)/doc/fpc
+	$(COPY) -R install/doc/* $(INNODIR)/doc/fpc
 	$(MKDIR) $(INNODIR)/units/msdos_
+	$(MAKE) -C fpcsrc/ compiler_cycle RELEASE=1 OS_SOURCE=win32 CPU_SOURCE=i386 CPU_TARGET=i8086 OS_TARGET=msdos OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs"
+	$(MAKE) -C fpcsrc/ compiler_install RELEASE=1 OS_SOURCE=win32 CPU_SOURCE=i386 CPU_TARGET=i8086 OS_TARGET=msdos OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs" INSTALL_PREFIX=$(INNODIR)
 	$(MAKE) buildmsdos_subarch SUBARCH=8086 OS_SOURCE=win32 CPU_SOURCE=i386 INSTALL_PREFIX=$(INNODIR)
 	$(MAKE) buildmsdos_subarch SUBARCH=80186 OS_SOURCE=win32 CPU_SOURCE=i386 INSTALL_PREFIX=$(INNODIR)
 	$(MAKE) buildmsdos_subarch SUBARCH=80286 OS_SOURCE=win32 CPU_SOURCE=i386 INSTALL_PREFIX=$(INNODIR)
+	$(MAKE) buildmsdos_subarch SUBARCH=80386 OS_SOURCE=win32 CPU_SOURCE=i386 INSTALL_PREFIX=$(INNODIR)
 	$(MOVE) $(INNODIR)/units/msdos_ $(INNODIR)/units/msdos
+	$(COPY) install/crossbinmsdos/nasm.exe $(INNODIR)/bin/i386-win32
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcsubst -i install/fpcmsdos.ist -o $(INNODIR)/fpcmsdos.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcmsdos.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
 innoandroidbuild:
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	$(DELTREE) $(INNODIR)
@@ -3188,7 +3410,7 @@ innoandroidbuild:
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpcandroid.ist -o $(INNODIR)/fpcandroid.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcandroid.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.android.exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.android.exe
 innoclean:
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	$(DELTREE) $(INNODIR)
@@ -3198,6 +3420,9 @@ innoce : checkfpcdir
 innox64 : checkfpcdir
 	$(MAKE) OS_TARGET=win64 CPU_TARGET=x86_64 innox64build NOGDB=1
 	$(MAKE) innoclean	
+innox86x64 : checkfpcdir
+	$(MAKE) innox86x64build
+	$(MAKE) innoclean
 innojvm : checkfpcdir
 	$(MAKE) OS_TARGET=java CPU_TARGET=jvm innojvmbuild NOGDB=1
 	$(MAKE) innoclean	
diff --git a/Makefile.fpc b/Makefile.fpc
index 49caca09..90ac0873 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -4,8 +4,7 @@
 
 [package]
 name=fpc
-version=3.3.1
-
+version=3.2.3
 
 [target]
 dirs=fpcsrc fpcdocs
@@ -87,6 +86,7 @@ help:
 	@$(ECHO)    deb         Build linux .deb packages
 	@$(ECHO)    inno        "Build Windows (Innosetup) based installer"
 	@$(ECHO)    innox64     "Build Win32-Win64 cross compiler installer"
+	@$(ECHO)    innox86x64  "Build Windows (Innosetup) combined installer for Win32 and Win64"
 	@$(ECHO)    innoce      "Build Win32-Wince cross compiler installer"
 	@$(ECHO)    innomsdos   "Build Win32-MsDos cross compiler installer"
 	@$(ECHO)    innoandroid "Build Win32-Android cross compiler installer"
@@ -162,6 +162,7 @@ ifeq ($(OS_TARGET),wince)
 endif
 ifeq ($(OS_TARGET),win64)
 	$(COPY) $(addprefix $(CVSINSTALL)/crossbinw64/, *.exe) $(INSTALL_BINDIR)
+	-$(COPY) $(CVSINSTALL)/binw32/gcc.exe $(INSTALL_BINDIR)/x86_64-win64-gcc.exe
 endif
 ifeq ($(OS_TARGET),msdos)
 	$(COPY) $(addprefix $(CVSINSTALL)/crossbinmsdos/, *.exe) $(INSTALL_BINDIR)
@@ -189,6 +190,7 @@ endif
 # ignore errors.
 ifeq ($(OS_TARGET),win64)
 	-$(COPY) $(addprefix $(CVSINSTALL)/binw64/,*.ico *.exe *.dll *.h *.manifest) $(INSTALL_BINDIR)
+	-$(COPY) $(CVSINSTALL)/binw32/gcc.exe $(INSTALL_BINDIR)/x86_64-win64-gcc.exe
 endif
 endif
 # binos2 (emx.dll,emxwrap.dll,unzip32.dll,fp2.ico)
@@ -216,7 +218,8 @@ install: $(BUILDSTAMP)
 	$(MAKE) installbase
 	$(MAKE) -C fpcsrc installother
 
-crossinstall: $(BUILDSTAMP)
+crossinstall: 
+	$(MAKE) $(BUILDSTAMP) CROSSINSTALL=1
 	$(MAKE) installbase CROSSINSTALL=1
 	$(MAKE) -C fpcsrc installother CROSSINSTALL=1
 
@@ -231,11 +234,13 @@ else
 	$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX).built.on.$(SOURCESUFFIX)
 endif
 
-crosszipinstall: $(BUILDSTAMP)
+crosszipinstall:
+	$(MAKE) $(BUILDSTAMP) CROSSINSTALL=1
 	$(MAKE) fpc_zipinstall CROSSINSTALL=1 ZIPTARGET=installbase ZIPNAME=base
 	$(MAKE) -C fpcsrc zipinstallother CROSSINSTALL=1
 
-crosssinglezipinstall: $(BUILDSTAMP)
+crosssinglezipinstall:
+	$(MAKE) $(BUILDSTAMP) CROSSINSTALL=1
 	$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(SOURCESUFFIX).cross.$(TARGETSUFFIX) CROSSINSTALL=1
 
 ##########################################################################
@@ -346,197 +351,201 @@ sunoszip: checkfpcdir
 
 renametoshort:
 # Compiler parts
-	-mv $(PKGPRE)base$(ZIPSUFFIX).zip base$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)installer$(ZIPSUFFIX).zip inst$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)base$(ZIPSUFFIX).zip base$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)installer$(ZIPSUFFIX).zip inst$(ZIPSUFFIXSHORT).zip
 # Utilities parts
-	-mv $(PKGPRE)asld$(ZIPSUFFIX).zip asld$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)make$(ZIPSUFFIX).zip make$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)gdb$(ZIPSUFFIX).zip gdb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)asld$(ZIPSUFFIX).zip asld$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)make$(ZIPSUFFIX).zip make$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)gdb$(ZIPSUFFIX).zip gdb$(ZIPSUFFIXSHORT).zip
 # Packages in alphabetical order
-	-mv $(PKGPRE)$(PKGUNITSPRE)a52$(ZIPSUFFIX).zip ua52$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ami-extra$(ZIPSUFFIX).zip uami$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)amunits$(ZIPSUFFIX).zip uamu$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)arosunits$(ZIPSUFFIX).zip uaru$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)aspell$(ZIPSUFFIX).zip uasp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)bfd$(ZIPSUFFIX).zip ubfd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)bzip2$(ZIPSUFFIX).zip ubz2$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)cairo$(ZIPSUFFIX).zip ucai$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)cdrom$(ZIPSUFFIX).zip ucdr$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)chm$(ZIPSUFFIX).zip uchm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)cocoaint$(ZIPSUFFIX).zip ucoc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)dblib$(ZIPSUFFIX).zip udblb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)dbus$(ZIPSUFFIX).zip udbus$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)dts$(ZIPSUFFIX).zip udts$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fastcgi$(ZIPSUFFIX).zip ufcgi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-async$(ZIPSUFFIX).zip ufcla$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-base$(ZIPSUFFIX).zip ufclb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-db$(ZIPSUFFIX).zip ufcld$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-extra$(ZIPSUFFIX).zip ufcex$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-fpcunit$(ZIPSUFFIX).zip ufclu$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-image$(ZIPSUFFIX).zip ufcli$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-js$(ZIPSUFFIX).zip ufcjs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-json$(ZIPSUFFIX).zip ufclj$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-net$(ZIPSUFFIX).zip ufcln$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-passrc$(ZIPSUFFIX).zip ufcls$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-pdf$(ZIPSUFFIX).zip ufcpd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-process$(ZIPSUFFIX).zip ufclp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-registry$(ZIPSUFFIX).zip ufclr$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-report$(ZIPSUFFIX).zip ufcre$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-res$(ZIPSUFFIX).zip ufcle$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-sdo$(ZIPSUFFIX).zip ufcsd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-sound$(ZIPSUFFIX).zip ufsnd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-stl$(ZIPSUFFIX).zip ufcst$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-web$(ZIPSUFFIX).zip ufclw$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fcl-xml$(ZIPSUFFIX).zip ufclx$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fftw$(ZIPSUFFIX).zip ufftw$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)a52$(ZIPSUFFIX).zip ua52$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ami-extra$(ZIPSUFFIX).zip uami$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)amunits$(ZIPSUFFIX).zip uamu$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)arosunits$(ZIPSUFFIX).zip uaru$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)aspell$(ZIPSUFFIX).zip uasp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)bfd$(ZIPSUFFIX).zip ubfd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)bzip2$(ZIPSUFFIX).zip ubz2$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)cairo$(ZIPSUFFIX).zip ucai$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)cdrom$(ZIPSUFFIX).zip ucdr$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)chm$(ZIPSUFFIX).zip uchm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)cocoaint$(ZIPSUFFIX).zip ucoc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)dblib$(ZIPSUFFIX).zip udblb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)dbus$(ZIPSUFFIX).zip udbus$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)dts$(ZIPSUFFIX).zip udts$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fastcgi$(ZIPSUFFIX).zip ufcgi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-async$(ZIPSUFFIX).zip ufcla$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-base$(ZIPSUFFIX).zip ufclb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-db$(ZIPSUFFIX).zip ufcld$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-extra$(ZIPSUFFIX).zip ufcex$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-fpcunit$(ZIPSUFFIX).zip ufclu$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-image$(ZIPSUFFIX).zip ufcli$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-js$(ZIPSUFFIX).zip ufcjs$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-json$(ZIPSUFFIX).zip ufclj$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-net$(ZIPSUFFIX).zip ufcln$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-passrc$(ZIPSUFFIX).zip ufcls$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-pdf$(ZIPSUFFIX).zip ufcpd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-process$(ZIPSUFFIX).zip ufclp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-registry$(ZIPSUFFIX).zip ufclr$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-report$(ZIPSUFFIX).zip ufpre$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-res$(ZIPSUFFIX).zip ufcle$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-sdo$(ZIPSUFFIX).zip ufcsd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-sound$(ZIPSUFFIX).zip ufsnd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-stl$(ZIPSUFFIX).zip ufcst$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-web$(ZIPSUFFIX).zip ufclw$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fcl-xml$(ZIPSUFFIX).zip ufclx$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fftw$(ZIPSUFFIX).zip ufftw$(ZIPSUFFIXSHORT).zip
 # This package corresponds to fpcsrc/packages main directory
-	-mv $(PKGPRE)$(PKGUNITSPRE)fpc-all$(ZIPSUFFIX).zip ufpca$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fpgtk$(ZIPSUFFIX).zip ufpgt$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fpindexer$(ZIPSUFFIX).zip ufpi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fpmkunit$(ZIPSUFFIX).zip ufpmk$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fppkg$(ZIPSUFFIX).zip ufppk$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fuse$(ZIPSUFFIX).zip ufuse$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)fv$(ZIPSUFFIX).zip ufv$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gdbint$(ZIPSUFFIX).zip ugdb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gdbm$(ZIPSUFFIX).zip ugdbm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ggi$(ZIPSUFFIX).zip uggi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gmp$(ZIPSUFFIX).zip ugmp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gnome1$(ZIPSUFFIX).zip ugno1$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gnutls$(ZIPSUFFIX).zip ugtls$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)googleapi$(ZIPSUFFIX).zip ugapi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)graph$(ZIPSUFFIX).zip ugrph$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gtk1$(ZIPSUFFIX).zip ugtk1$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)gtk2$(ZIPSUFFIX).zip ugtk2$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)hash$(ZIPSUFFIX).zip uhash$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)hermes$(ZIPSUFFIX).zip uherm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)httpd13$(ZIPSUFFIX).zip uhd13$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)httpd20$(ZIPSUFFIX).zip uhd20$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)httpd22$(ZIPSUFFIX).zip uhd22$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)httpd24$(ZIPSUFFIX).zip uhd24$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ibase$(ZIPSUFFIX).zip uibas$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)iconvenc$(ZIPSUFFIX).zip uicve$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ide$(ZIPSUFFIX).zip uide$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)imagemagick$(ZIPSUFFIX).zip uimgm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)imlib$(ZIPSUFFIX).zip uimlb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)iosxlocale$(ZIPSUFFIX).zip uiosl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)jni$(ZIPSUFFIX).zip ujni$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ldap$(ZIPSUFFIX).zip uldap$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libc$(ZIPSUFFIX).zip ulibc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libcups$(ZIPSUFFIX).zip ulcup$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libcurl$(ZIPSUFFIX).zip ulcur$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libenet$(ZIPSUFFIX).zip ulnet$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libffi$(ZIPSUFFIX).zip ulffi$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libfontconfig$(ZIPSUFFIX).zip ulfcg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libgbafpc$(ZIPSUFFIX).zip ulgba$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libgc$(ZIPSUFFIX).zip ulgc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libgd$(ZIPSUFFIX).zip ulgd$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libmagic$(ZIPSUFFIX).zip ulmag$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libmicrohttpd$(ZIPSUFFIX).zip ulmic$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libndsfpc$(ZIPSUFFIX).zip ulnds$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libogcfpc$(ZIPSUFFIX).zip ulogc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libpng$(ZIPSUFFIX).zip ulpng$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libsee$(ZIPSUFFIX).zip ulsee$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libtar$(ZIPSUFFIX).zip ultar$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libusb$(ZIPSUFFIX).zip ulusb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)libvlc$(ZIPSUFFIX).zip ulvlc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fpc-all$(ZIPSUFFIX).zip ufpca$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fpgtk$(ZIPSUFFIX).zip ufpgt$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fpindexer$(ZIPSUFFIX).zip ufpi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fpmkunit$(ZIPSUFFIX).zip ufpmk$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fppkg$(ZIPSUFFIX).zip ufppk$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fuse$(ZIPSUFFIX).zip ufuse$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)fv$(ZIPSUFFIX).zip ufv$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gdbint$(ZIPSUFFIX).zip ugdb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gdbm$(ZIPSUFFIX).zip ugdbm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ggi$(ZIPSUFFIX).zip uggi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gmp$(ZIPSUFFIX).zip ugmp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gnome1$(ZIPSUFFIX).zip ugno1$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gnutls$(ZIPSUFFIX).zip ugtls$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)googleapi$(ZIPSUFFIX).zip ugapi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)graph$(ZIPSUFFIX).zip ugrph$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gtk1$(ZIPSUFFIX).zip ugtk1$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)gtk2$(ZIPSUFFIX).zip ugtk2$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)hash$(ZIPSUFFIX).zip uhash$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)hermes$(ZIPSUFFIX).zip uherm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)httpd13$(ZIPSUFFIX).zip uhd13$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)httpd20$(ZIPSUFFIX).zip uhd20$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)httpd22$(ZIPSUFFIX).zip uhd22$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)httpd24$(ZIPSUFFIX).zip uhd24$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ibase$(ZIPSUFFIX).zip uibas$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)iconvenc$(ZIPSUFFIX).zip uicve$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ide$(ZIPSUFFIX).zip uide$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)imagemagick$(ZIPSUFFIX).zip uimgm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)imlib$(ZIPSUFFIX).zip uimlb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)iosxlocale$(ZIPSUFFIX).zip uiosl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)jni$(ZIPSUFFIX).zip ujni$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ldap$(ZIPSUFFIX).zip uldap$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libc$(ZIPSUFFIX).zip ulibc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libcups$(ZIPSUFFIX).zip ulcup$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libcurl$(ZIPSUFFIX).zip ulcur$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libenet$(ZIPSUFFIX).zip ulnet$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libffi$(ZIPSUFFIX).zip ulffi$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libfontconfig$(ZIPSUFFIX).zip ulfcg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libgbafpc$(ZIPSUFFIX).zip ulgba$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libgc$(ZIPSUFFIX).zip ulgc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libgd$(ZIPSUFFIX).zip ulgd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libmagic$(ZIPSUFFIX).zip ulmag$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libmicrohttpd$(ZIPSUFFIX).zip ulmic$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libndsfpc$(ZIPSUFFIX).zip ulnds$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libogcfpc$(ZIPSUFFIX).zip ulogc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libpng$(ZIPSUFFIX).zip ulpng$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libsee$(ZIPSUFFIX).zip ulsee$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libtar$(ZIPSUFFIX).zip ultar$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libusb$(ZIPSUFFIX).zip ulusb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libvlc$(ZIPSUFFIX).zip ulvlc$(ZIPSUFFIXSHORT).zip
 # This package resides in fpcsrc/packages/libxml directory
-	-mv $(PKGPRE)$(PKGUNITSPRE)libxml2$(ZIPSUFFIX).zip ulxml$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)lua$(ZIPSUFFIX).zip ulua$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)mad$(ZIPSUFFIX).zip umad$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)matroska$(ZIPSUFFIX).zip umatk$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)modplug$(ZIPSUFFIX).zip umplg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)morphunits$(ZIPSUFFIX).zip umrph$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)mysql$(ZIPSUFFIX).zip umysq$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ncurses$(ZIPSUFFIX).zip uncrs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)newt$(ZIPSUFFIX).zip unewt$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)numlib$(ZIPSUFFIX).zip unlib$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)nvapi$(ZIPSUFFIX).zip unva$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)objcrtl$(ZIPSUFFIX).zip uobjc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)odata$(ZIPSUFFIX).zip uodat$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)odbc$(ZIPSUFFIX).zip uodbc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)oggvorbis$(ZIPSUFFIX).zip uoggv$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)openal$(ZIPSUFFIX).zip uoal$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)opencl$(ZIPSUFFIX).zip uocl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)opengl$(ZIPSUFFIX).zip uogl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)opengles$(ZIPSUFFIX).zip uogls$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)openssl$(ZIPSUFFIX).zip uossl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)oracle$(ZIPSUFFIX).zip uora$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)os2units$(ZIPSUFFIX).zip uos2$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)os4units$(ZIPSUFFIX).zip uos4$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)palmunits$(ZIPSUFFIX).zip upalm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pasjpeg$(ZIPSUFFIX).zip upjp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pastojs$(ZIPSUFFIX).zip up2js$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)paszlib$(ZIPSUFFIX).zip upzl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pcap$(ZIPSUFFIX).zip upcap$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)postgres$(ZIPSUFFIX).zip upgr$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)proj4$(ZIPSUFFIX).zip uprj4$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)ptc$(ZIPSUFFIX).zip uptc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pthreads$(ZIPSUFFIX).zip upthr$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)pxlib$(ZIPSUFFIX).zip upxl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)regexpr$(ZIPSUFFIX).zip ureg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rexx$(ZIPSUFFIX).zip urexx$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)libxml2$(ZIPSUFFIX).zip ulxml$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)lua$(ZIPSUFFIX).zip ulua$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)mad$(ZIPSUFFIX).zip umad$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)matroska$(ZIPSUFFIX).zip umatk$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)modplug$(ZIPSUFFIX).zip umplg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)morphunits$(ZIPSUFFIX).zip umrph$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)mysql$(ZIPSUFFIX).zip umysq$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ncurses$(ZIPSUFFIX).zip uncrs$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)newt$(ZIPSUFFIX).zip unewt$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)numlib$(ZIPSUFFIX).zip unlib$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)nvapi$(ZIPSUFFIX).zip unva$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)objcrtl$(ZIPSUFFIX).zip uobjc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)odata$(ZIPSUFFIX).zip uodat$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)odbc$(ZIPSUFFIX).zip uodbc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)oggvorbis$(ZIPSUFFIX).zip uoggv$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)openal$(ZIPSUFFIX).zip uoal$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)opencl$(ZIPSUFFIX).zip uocl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)opengl$(ZIPSUFFIX).zip uogl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)opengles$(ZIPSUFFIX).zip uogls$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)openssl$(ZIPSUFFIX).zip uossl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)oracle$(ZIPSUFFIX).zip uora$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)os2units$(ZIPSUFFIX).zip uos2$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)os4units$(ZIPSUFFIX).zip uos4$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)palmunits$(ZIPSUFFIX).zip upalm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pasjpeg$(ZIPSUFFIX).zip upjp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pastojs$(ZIPSUFFIX).zip up2js$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)paszlib$(ZIPSUFFIX).zip upzl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pcap$(ZIPSUFFIX).zip upcap$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)postgres$(ZIPSUFFIX).zip upgr$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)proj4$(ZIPSUFFIX).zip uprj4$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)ptc$(ZIPSUFFIX).zip uptc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pthreads$(ZIPSUFFIX).zip upthr$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)pxlib$(ZIPSUFFIX).zip upxl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)qlunits$(ZIPSUFFIX).zip uqlun$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)regexpr$(ZIPSUFFIX).zip ureg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rexx$(ZIPSUFFIX).zip urexx$(ZIPSUFFIXSHORT).zip
 # This package resides in fpcsrc/packages/librsvg directory
-	-mv $(PKGPRE)$(PKGUNITSPRE)rsvg$(ZIPSUFFIX).zip ursvg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-console$(ZIPSUFFIX).zip urtlc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-extra$(ZIPSUFFIX).zip urtle$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-generics$(ZIPSUFFIX).zip urtlg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-objpas$(ZIPSUFFIX).zip urtlo$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)rtl-unicode$(ZIPSUFFIX).zip urtlu$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)sdl$(ZIPSUFFIX).zip usdl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)sndfile$(ZIPSUFFIX).zip usndf$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)sqlite$(ZIPSUFFIX).zip usqlt$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)svgalib$(ZIPSUFFIX).zip usvga$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)symbolic$(ZIPSUFFIX).zip usymb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)syslog$(ZIPSUFFIX).zip usysl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)tcl$(ZIPSUFFIX).zip utcl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)tosunits$(ZIPSUFFIX).zip utos$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)univint$(ZIPSUFFIX).zip uuniv$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)unixutil$(ZIPSUFFIX).zip uunix$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)unzip$(ZIPSUFFIX).zip uzip$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)users$(ZIPSUFFIX).zip uuser$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)utmp$(ZIPSUFFIX).zip uutmp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)uuid$(ZIPSUFFIX).zip uuuid$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)vcl-compat$(ZIPSUFFIX).zip uvcl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)webidl$(ZIPSUFFIX).zip uwidl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)winceunits$(ZIPSUFFIX).zip uwice$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)winunits-base$(ZIPSUFFIX).zip uwib$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)winunits-jedi$(ZIPSUFFIX).zip uwij$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)x11$(ZIPSUFFIX).zip ux11$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)xforms$(ZIPSUFFIX).zip uxfrm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)zlib$(ZIPSUFFIX).zip uzlib$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)$(PKGUNITSPRE)zorba$(ZIPSUFFIX).zip uzorb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rsvg$(ZIPSUFFIX).zip ursvg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-console$(ZIPSUFFIX).zip urtlc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-extra$(ZIPSUFFIX).zip urtle$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-generics$(ZIPSUFFIX).zip urtlg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-objpas$(ZIPSUFFIX).zip urtlo$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)rtl-unicode$(ZIPSUFFIX).zip urtlu$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)sdl$(ZIPSUFFIX).zip usdl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)sndfile$(ZIPSUFFIX).zip usndf$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)sqlite$(ZIPSUFFIX).zip usqlt$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)svgalib$(ZIPSUFFIX).zip usvga$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)symbolic$(ZIPSUFFIX).zip usymb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)syslog$(ZIPSUFFIX).zip usysl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)tcl$(ZIPSUFFIX).zip utcl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)tosunits$(ZIPSUFFIX).zip utos$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)tplylib$(ZIPSUFFIX).zip utpll$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)univint$(ZIPSUFFIX).zip uuniv$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)unixutil$(ZIPSUFFIX).zip uunix$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)unzip$(ZIPSUFFIX).zip uzip$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)users$(ZIPSUFFIX).zip uuser$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)utmp$(ZIPSUFFIX).zip uutmp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)uuid$(ZIPSUFFIX).zip uuuid$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)vcl-compat$(ZIPSUFFIX).zip uvcl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)webidl$(ZIPSUFFIX).zip uwidl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)winceunits$(ZIPSUFFIX).zip uwice$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)winunits-base$(ZIPSUFFIX).zip uwib$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)winunits-jedi$(ZIPSUFFIX).zip uwij$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)x11$(ZIPSUFFIX).zip ux11$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)xforms$(ZIPSUFFIX).zip uxfrm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)zlib$(ZIPSUFFIX).zip uzlib$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)$(PKGUNITSPRE)zorba$(ZIPSUFFIX).zip uzorb$(ZIPSUFFIXSHORT).zip
 # Utils packages in alphabetical order
-	-mv $(PKGPRE)utils$(ZIPSUFFIX).zip utils$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-debugsrv$(ZIPSUFFIX).zip udbgs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-dxegen$(ZIPSUFFIX).zip udxeg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpcm$(ZIPSUFFIX).zip ufpcm$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpcmkcfg$(ZIPSUFFIX).zip ufpck$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpcres$(ZIPSUFFIX).zip ufprs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpcreslipo$(ZIPSUFFIX).zip ufprl$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpdoc$(ZIPSUFFIX).zip ufpdc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fpmc$(ZIPSUFFIX).zip ufpmc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fppkg$(ZIPSUFFIX).zip ufpkg$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-fprcp$(ZIPSUFFIX).zip ufprc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-h2pas$(ZIPSUFFIX).zip uh2pa$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-importtl$(ZIPSUFFIX).zip uimpt$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-instantfpc$(ZIPSUFFIX).zip uifpc$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-javaapp$(ZIPSUFFIX).zip ujvp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-json2pas$(ZIPSUFFIX).zip ujs2p$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils$(ZIPSUFFIX).zip utils$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-debugsrv$(ZIPSUFFIX).zip dbgs$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-dxegen$(ZIPSUFFIX).zip dxeg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpcm$(ZIPSUFFIX).zip fpcm$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpcmkcfg$(ZIPSUFFIX).zip fcmk$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpcres$(ZIPSUFFIX).zip fprs$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpcreslipo$(ZIPSUFFIX).zip fprl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpdoc$(ZIPSUFFIX).zip fpdc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fpmc$(ZIPSUFFIX).zip fpmc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fppkg$(ZIPSUFFIX).zip fpkg$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-fprcp$(ZIPSUFFIX).zip fprc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-h2pas$(ZIPSUFFIX).zip h2pa$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-ihxutil$(ZIPSUFFIX).zip ihxu$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-importtl$(ZIPSUFFIX).zip impt$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-instantfpc$(ZIPSUFFIX).zip ifpc$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-javaapp$(ZIPSUFFIX).zip jvp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-json2pas$(ZIPSUFFIX).zip jsnp$(ZIPSUFFIXSHORT).zip
 # This package resides in fpcsrc/utils/tply directory
-	-mv $(PKGPRE)utils-lexyacc$(ZIPSUFFIX).zip ulexy$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-mksymbian$(ZIPSUFFIX).zip umksb$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-pas2fpm$(ZIPSUFFIX).zip up2fp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-pas2jni$(ZIPSUFFIX).zip up2jn$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-pas2js$(ZIPSUFFIX).zip uupjs$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-pas2ut$(ZIPSUFFIX).zip up2ut$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-rmwait$(ZIPSUFFIX).zip urmw$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-sim_pasc$(ZIPSUFFIX).zip usmp$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-svn2cvs$(ZIPSUFFIX).zip us2c$(ZIPSUFFIXSHORT).zip
-	-mv $(PKGPRE)utils-unicode$(ZIPSUFFIX).zip uucd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-lexyacc$(ZIPSUFFIX).zip tply$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-mksymbian$(ZIPSUFFIX).zip mksb$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-pas2fpm$(ZIPSUFFIX).zip p2fp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-pas2jni$(ZIPSUFFIX).zip p2jn$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-pas2js$(ZIPSUFFIX).zip p2js$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-pas2ut$(ZIPSUFFIX).zip p2ut$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-rmwait$(ZIPSUFFIX).zip rmw$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-sim_pasc$(ZIPSUFFIX).zip smp$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-svn2cvs$(ZIPSUFFIX).zip s2c$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-unicode$(ZIPSUFFIX).zip ucd$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)utils-wasmbin$(ZIPSUFFIX).zip wsbn$(ZIPSUFFIXSHORT).zip
 
 # Sources only
-	-mv $(PKGPRE)rtl$(ZIPSUFFIX).zip rtl$(ZIPSUFFIXSHORT).zip
+	-$(MOVE) $(PKGPRE)rtl$(ZIPSUFFIX).zip rtl$(ZIPSUFFIXSHORT).zip
 
 shortsrc:
 	$(MAKE) renametoshort ZIPSUFFIX=$(ZIPSOURCESUFFIX) ZIPSUFFIXSHORT=src
@@ -1032,9 +1041,9 @@ endif
 
 innocheck:
 ifndef NODOCS
-# Check for doc-pdf.zip
-ifeq ($(wildcard doc-pdf.zip),)
-	@$(ECHO) "No documentation available. Please copy the file doc-pdf.zip to this directory."
+# Check for doc-chm.zip
+ifeq ($(wildcard doc-chm.zip),)
+	@$(ECHO) "No documentation available. Please copy the file doc-chm.zip to this directory."
 	@exit 1
 endif
 endif
@@ -1055,13 +1064,13 @@ innobuild: innocheck build
 	$(COPYTREE) demo $(INNODIR)
 	$(COPYTREE) install/unicode $(INNODIR)
 ifndef NODOCS
-	unzip -d $(INNODIR) doc-pdf.zip
+	unzip -d $(INNODIR) doc-chm.zip
 endif
 	$(MAKE) install INSTALL_PREFIX=$(INNODIR)
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpc.ist -o $(INNODIR)/fpc.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	$(INNOCMD_ISCC)
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_TARGET).exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_TARGET).exe
 
 innocebuild: innocheck buildce
 	rmcvsdir$(EXEEXT) $(INNODIR)
@@ -1072,7 +1081,7 @@ innocebuild: innocheck buildce
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpcce.ist -o $(INNODIR)/fpcce.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcce.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
 
 innox64build: innocheck buildx64
 	rmcvsdir$(EXEEXT) $(INNODIR)
@@ -1083,8 +1092,24 @@ innox64build: innocheck buildx64
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpcx64.ist -o $(INNODIR)/fpcx64.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcx64.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
-		
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
+
+innox86x64build: innocheck
+	rmcvsdir$(EXEEXT) $(INNODIR)
+	$(DELTREE) $(INNODIR)
+	$(MKDIR) $(INNODIR)
+	$(COPYTREE) demo $(INNODIR)
+	$(COPYTREE) install/unicode $(INNODIR)
+ifndef NODOCS
+	unzip -d $(INNODIR) doc-chm.zip
+endif
+	$(MAKE) install INSTALL_PREFIX=$(INNODIR)
+	$(MAKE) crossinstall INSTALL_PREFIX=$(INNODIR) OS_TARGET=win64 CPU_TARGET=x86_64
+	rmcvsdir$(EXEEXT) $(INNODIR)
+	fpcmkcfg -t install/fpcx86x64.ist -o $(INNODIR)/fpc.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
+	$(INNOCMD_ISCC)
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).win32.and.win64.exe
+
 innojvmbuild: innocheck buildjvm
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	$(DELTREE) $(INNODIR)
@@ -1095,11 +1120,13 @@ innojvmbuild: innocheck buildjvm
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpcjvm.ist -o $(INNODIR)/fpcjvm.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcjvm.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(CPU_TARGET).exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(CPU_TARGET).exe
 
 buildmsdos_subarch_mm: fpcsrc/build-stamp.cross-msdos
-	$(MAKE) -C fpcsrc/rtl clean install OS_TARGET=msdos FPC=ppc8086 CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
-	$(MAKE) -C fpcsrc/packages clean install OS_TARGET=msdos FPC=ppc8086 CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)" FPCFPMAKE=$(BASEDIR)/fpcsrc/compiler/ppc
+	$(MAKE) -C fpcsrc/rtl clean FPC=$(realpath ./fpcsrc/compiler/ppcross8086.exe) OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
+	$(MAKE) -C fpcsrc/rtl install FPC=$(realpath ./fpcsrc/compiler/ppcross8086.exe) OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
+	$(MAKE) -C fpcsrc/packages clean FPC=$(realpath ./fpcsrc/compiler/ppcross8086.exe) OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)" FPCFPMAKE=$(BASEDIR)/fpcsrc/compiler/ppc
+	$(MAKE) -C fpcsrc/packages install FPC=$(realpath ./fpcsrc/compiler/ppcross8086.exe) OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)" FPCFPMAKE=$(BASEDIR)/fpcsrc/compiler/ppc
 	$(MOVE) $(INSTALL_BASEDIR)/units/msdos $(INSTALL_BASEDIR)/units/msdos_/$(SUBARCH)-$(MEMORY_MODEL)
 
 buildmsdos_subarch:
@@ -1108,57 +1135,29 @@ buildmsdos_subarch:
 	$(MAKE) buildmsdos_subarch_mm MEMORY_MODEL=medium
 	$(MAKE) buildmsdos_subarch_mm MEMORY_MODEL=compact
 	$(MAKE) buildmsdos_subarch_mm MEMORY_MODEL=large
-ifeq ($(findstring 3.0.,$(FPC_VERSION)),)
 	$(MAKE) buildmsdos_subarch_mm MEMORY_MODEL=huge
-endif
-
-build_msdos:
-	$(DELTREE) $(INSTALL_BASEDIR)/units/msdos_
-	$(MKDIR) $(INSTALL_BASEDIR)/units/msdos_
-	$(MAKE) buildmsdos_subarch SUBARCH=8086
-	$(MAKE) buildmsdos_subarch SUBARCH=80186
-	$(MAKE) buildmsdos_subarch SUBARCH=80286
-	$(MAKE) buildmsdos_subarch SUBARCH=80386
-	$(MOVE) $(INSTALL_BASEDIR)/units/msdos_ $(INSTALL_BASEDIR)/units/msdos
-
-buildmsdos_rtl_subarch_mm:
-	$(MAKE) -C fpcsrc/rtl/msdos info clean all FPC=ppc8086 CPU_TARGET=i8086 OS_TARGET=msdos OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
-	$(MAKE) -C fpcsrc/rtl/msdos install FPC=ppc8086 CPU_TARGET=i8086 OS_TARGET=msdos CROSSINSTALL=1 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs -Wm$(MEMORY_MODEL) -Cp$(SUBARCH)"
-	$(MOVE) $(INSTALL_BASEDIR)/units/msdos $(INSTALL_BASEDIR)/units/msdos_/$(SUBARCH)-$(MEMORY_MODEL)
-
-buildmsdos_rtl_subarch:
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=tiny CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=small CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=medium CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=compact CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=large CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-ifeq ($(findstring 3.0.,$(FPC_VERSION)),)
-	$(MAKE) buildmsdos_rtl_subarch_mm MEMORY_MODEL=huge CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-endif
-
-buildmsdos_rtl: fpcsrc/build-stamp.cross-msdos
-	$(DELTREE) $(INSTALL_BASEDIR)/units/msdos_
-	$(MKDIR) $(INSTALL_BASEDIR)/units/msdos_
-	$(MAKE) buildmsdos_rtl_subarch SUBARCH=8086 CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch SUBARCH=80186 CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch SUBARCH=80286 CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MAKE) buildmsdos_rtl_subarch SUBARCH=80386 CPU_TARGET=i8086 OS_TARGET=msdos FPC=ppc8086
-	$(MOVE) $(INSTALL_BASEDIR)/units/msdos_ $(INSTALL_BASEDIR)/units/msdos
 
 innomsdosbuild: innocheck
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	$(DELTREE) $(INNODIR)
 	$(MKDIR) $(INNODIR)
 	$(COPYTREE) demo $(INNODIR)
+	$(MKDIR) $(INNODIR)/doc
+	$(MKDIR) $(INNODIR)/doc/fpc
+	$(COPY) -R install/doc/* $(INNODIR)/doc/fpc
 	$(MKDIR) $(INNODIR)/units/msdos_
+	$(MAKE) -C fpcsrc/ compiler_cycle RELEASE=1 OS_SOURCE=win32 CPU_SOURCE=i386 CPU_TARGET=i8086 OS_TARGET=msdos OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs"
+	$(MAKE) -C fpcsrc/ compiler_install RELEASE=1 OS_SOURCE=win32 CPU_SOURCE=i386 CPU_TARGET=i8086 OS_TARGET=msdos OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="$(OPT) -CX -XXs" INSTALL_PREFIX=$(INNODIR)
 	$(MAKE) buildmsdos_subarch SUBARCH=8086 OS_SOURCE=win32 CPU_SOURCE=i386 INSTALL_PREFIX=$(INNODIR)
 	$(MAKE) buildmsdos_subarch SUBARCH=80186 OS_SOURCE=win32 CPU_SOURCE=i386 INSTALL_PREFIX=$(INNODIR)
 	$(MAKE) buildmsdos_subarch SUBARCH=80286 OS_SOURCE=win32 CPU_SOURCE=i386 INSTALL_PREFIX=$(INNODIR)
+	$(MAKE) buildmsdos_subarch SUBARCH=80386 OS_SOURCE=win32 CPU_SOURCE=i386 INSTALL_PREFIX=$(INNODIR)
 	$(MOVE) $(INNODIR)/units/msdos_ $(INNODIR)/units/msdos
+	$(COPY) install/crossbinmsdos/nasm.exe $(INNODIR)/bin/i386-win32
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcsubst -i install/fpcmsdos.ist -o $(INNODIR)/fpcmsdos.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcmsdos.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.$(FULL_TARGET).exe
 
 innoandroidbuild:
 	rmcvsdir$(EXEEXT) $(INNODIR)
@@ -1193,7 +1192,7 @@ innoandroidbuild:
 	rmcvsdir$(EXEEXT) $(INNODIR)
 	fpcmkcfg -t install/fpcandroid.ist -o $(INNODIR)/fpcandroid.iss $(FPCISSSUBST) -d FPCVERSION=$(PACKAGE_VERSION)
 	"$(ISCCPROG)" $(INNODIR)/fpcandroid.iss
-	$(MOVE) $(INNODIR)/Output/setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.android.exe
+	$(MOVE) $(INNODIR)/Output/fpc-setup.exe fpc-$(PACKAGE_VERSION).$(FULL_SOURCE).cross.android.exe
 
 innoclean:
 	rmcvsdir$(EXEEXT) $(INNODIR)
@@ -1207,6 +1206,10 @@ innox64 : checkfpcdir
 	$(MAKE) OS_TARGET=win64 CPU_TARGET=x86_64 innox64build NOGDB=1
 	$(MAKE) innoclean	
 
+innox86x64 : checkfpcdir
+	$(MAKE) innox86x64build
+	$(MAKE) innoclean
+
 innojvm : checkfpcdir
 	$(MAKE) OS_TARGET=java CPU_TARGET=jvm innojvmbuild NOGDB=1
 	$(MAKE) innoclean	
diff --git a/createbranch.sh b/createbranch.sh
index ac9eb1b4..b440da4e 100755
--- a/createbranch.sh
+++ b/createbranch.sh
@@ -1,58 +1,57 @@
 #!/bin/sh
+set -e
 
-# Default read-only HTTP URL used for externals
-SVNHTTPURL=https://svn.freepascal.org/svn
-
-if [ $# -lt 1 ]; then
-  echo "Usage: $0 <branch/tag name>"
+if [ $# -lt 2 ]; then
+  echo "Usage: $0 <branch/tag> <name>"
   echo
-  echo "Example: $0 branches/fixes_2_1"
-  echo "         $0 tags/release_2_0_4"
+  echo "Example: $0 branch fixes_2_1"
+  echo "         $0 tag release_2_0_4"
   echo
   exit 1
 fi
-NEWSVNTAG=$1
 
-# For testing output the svn commands
-if [ ."$2" = ."test" ]; then
-  SVN="echo svn"
+# For testing output the git commands
+if [ ."$3" = ."test" ]; then
+  GIT="echo git"
 else
-  SVN=svn
+  GIT=git
 fi
 
-# Decode SVN URL from current fpcbuild URL
-FPCBUILDURL=`svn info . | grep URL | grep fpcbuild`
+# Decode git remote from current fpcbuild remote
+FPCBUILDURL=`git remote get-url origin | grep fpc/build.git`
 if [ $? -ne 0 ]; then
-  echo "This is not an fpcbuild checkout"
+   echo "This is not an fpcbuild checkout"
 fi
-SVNURL=`echo $FPCBUILDURL | sed -e 's+URL: ++' -e 's+/fpcbuild/.*$++'`
-OLDSVNTAG=`echo $FPCBUILDURL | sed -e 's+URL:.*fpcbuild/++'`
-COMMITMSG="Creating branch $NEWSVNTAG"
-
-echo "SVN URL: $SVNURL"
-echo "Old SVN (branch) dir: $OLDSVNTAG"
-echo "New SVN (branch) dir: $NEWSVNTAG"
-
-$SVN copy $SVNURL/fpc/$OLDSVNTAG $SVNURL/fpc/$NEWSVNTAG -m "$COMMITMSG"
-$SVN copy $SVNURL/fpcbuild/$OLDSVNTAG $SVNURL/fpcbuild/$NEWSVNTAG -m "$COMMITMSG"
 
-# Generate svn:externals property
-cat << EXTERNALEOF > external.lst
-../../../fpc/$NEWSVNTAG fpcsrc
-../../../fpcdocs/trunk fpcdocs
-EXTERNALEOF
-echo
-echo "External list:"
-echo "===="
-cat external.lst
-echo "===="
-echo
+echo Using remote url $FPCBUILDURL
 
-# Setting properties on a remote URL is not supported.
-# To workaround we need to do a (non-recursive) checkout of the
-# just created fpcbuild branch
-$SVN co -N $SVNURL/fpcbuild/$NEWSVNTAG branchtmp
-$SVN ps -F external.lst svn:externals branchtmp
+echo Updating everything
+$GIT submodule update --init --recursive
+$GIT pull --recurse-submodule
+$GIT submodule update --init --recursive
 
-# Commit and cleanup
-$SVN ci branchtmp -m "$COMMITMSG" && rm -rf branchtmp && rm -f external.lst
+if [ ."$1" = ."tag" ]; then
+  echo Tagging $2
+  $GIT tag -a $2 -m "  Tagging $2"
+  $GIT submodule foreach git tag -a $2 -m "  Tagging $2"
+  echo Pushing still disabled, check the script $0 for #!!!
+  #!!! $GIT submodule foreach git push origin $2
+  #!!! $GIT push origin $2
+else
+  if [ ."$1" = ."branch" ]; then
+    $GIT checkout -b $2
+    cd fpcsrc
+    $GIT checkout -b $2
+    cd ../fpcdocs
+    $GIT checkout main
+    $GIT pull
+    cd ..
+    $GIT commit -a -m "Creating branch $2"
+    echo Pushing still disabled, check the script $0 for #!!!
+    #!!! $GIT submodule foreach git push origin $2 
+    #!!! $GIT push origin $2
+  else
+    echo Unknown operation $1
+    exit 1
+  fi 
+fi
diff --git a/demo/Makefile b/demo/Makefile
index a0ef5d0d..8b802e6e 100644
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -330,7 +330,7 @@ FPCFPMAKE=$(FPC)
 endif
 endif
 override PACKAGE_NAME=demo
-override PACKAGE_VERSION=3.3.1
+override PACKAGE_VERSION=3.2.3
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_DIRS+=text  linux unix graph lister
 endif
@@ -415,7 +415,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_DIRS+=text
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 override TARGET_DIRS+=text
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -430,7 +430,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_DIRS+=text
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 override TARGET_DIRS+=text
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -508,9 +508,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_DIRS+=text
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_DIRS+=text
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_DIRS+=text
 endif
@@ -532,6 +529,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_DIRS+=text
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+override TARGET_DIRS+=text
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_DIRS+=text  linux unix graph lister
 endif
@@ -589,24 +589,15 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_DIRS+=text
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
+ifeq ($(FULL_TARGET),aarch64-ios)
 override TARGET_DIRS+=text
 endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_DIRS+=text  linux unix graph lister
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_DIRS+=text  linux unix graph lister
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
+ifeq ($(FULL_TARGET),wasm-wasm)
 override TARGET_DIRS+=text
 endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_DIRS+=text  linux unix graph lister
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override TARGET_DIRS+=text
-endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -810,7 +801,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -948,14 +938,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1325,16 +1315,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1452,15 +1433,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1615,14 +1594,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1646,9 +1623,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1669,14 +1645,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
@@ -1910,7 +1885,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 TARGET_DIRS_TEXT=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 TARGET_DIRS_TEXT=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1932,7 +1907,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 TARGET_DIRS_TEXT=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 TARGET_DIRS_TEXT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -2042,9 +2017,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 TARGET_DIRS_TEXT=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_DIRS_TEXT=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_DIRS_TEXT=1
 endif
@@ -2066,6 +2038,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 TARGET_DIRS_TEXT=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+TARGET_DIRS_TEXT=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 TARGET_DIRS_TEXT=1
 TARGET_DIRS_LINUX=1
@@ -2143,36 +2118,19 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 TARGET_DIRS_TEXT=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-TARGET_DIRS_TEXT=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-TARGET_DIRS_TEXT=1
-TARGET_DIRS_LINUX=1
-TARGET_DIRS_UNIX=1
-TARGET_DIRS_GRAPH=1
-TARGET_DIRS_LISTER=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 TARGET_DIRS_TEXT=1
-TARGET_DIRS_LINUX=1
-TARGET_DIRS_UNIX=1
-TARGET_DIRS_GRAPH=1
-TARGET_DIRS_LISTER=1
 endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
+ifeq ($(FULL_TARGET),wasm-wasm)
 TARGET_DIRS_TEXT=1
 endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),sparc64-linux)
 TARGET_DIRS_TEXT=1
 TARGET_DIRS_LINUX=1
 TARGET_DIRS_UNIX=1
 TARGET_DIRS_GRAPH=1
 TARGET_DIRS_LISTER=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-TARGET_DIRS_TEXT=1
-endif
 ifdef TARGET_DIRS_TEXT
 text_all:
 	$(MAKE) -C text all
diff --git a/demo/Makefile.fpc b/demo/Makefile.fpc
index da164ae9..7ac64ae9 100644
--- a/demo/Makefile.fpc
+++ b/demo/Makefile.fpc
@@ -4,7 +4,7 @@
 
 [package]
 name=demo
-version=3.3.1
+version=3.2.3
 
 [target]
 dirs=text
diff --git a/demo/freebsd/Makefile b/demo/freebsd/Makefile
index 8965a63e..b633c1f1 100644
--- a/demo/freebsd/Makefile
+++ b/demo/freebsd/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -413,7 +413,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -428,7 +428,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -506,9 +506,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
@@ -530,6 +527,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
@@ -587,22 +587,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
+ifeq ($(FULL_TARGET),aarch64-ios)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_PROGRAMS+=fontdemo sysmousetest demo_kqueue demo_sendfile
 endif
 ifdef REQUIRE_UNITSDIR
@@ -807,7 +798,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -945,14 +935,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1356,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1371,7 +1361,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1449,9 +1439,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1473,6 +1460,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1530,22 +1520,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1637,16 +1618,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1755,7 +1727,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1784,7 +1756,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1815,7 +1787,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1858,15 +1829,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1935,14 +1904,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1966,9 +1933,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1989,14 +1955,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/graph/Makefile b/demo/graph/Makefile
index 4b55db3f..0d83988a 100644
--- a/demo/graph/Makefile
+++ b/demo/graph/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -416,7 +416,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -431,7 +431,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -509,9 +509,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
@@ -533,6 +530,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
@@ -590,22 +590,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
+ifeq ($(FULL_TARGET),aarch64-ios)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_PROGRAMS+=fpctris mandel samegame quad maze gravwars
 endif
 ifeq ($(FULL_TARGET),i386-linux)
@@ -692,7 +683,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_UNITS+=gameunit
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 override TARGET_UNITS+=gameunit
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -707,7 +698,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_UNITS+=gameunit
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 override TARGET_UNITS+=gameunit
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -785,9 +776,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_UNITS+=gameunit
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=gameunit
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_UNITS+=gameunit
 endif
@@ -809,6 +797,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_UNITS+=gameunit
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+override TARGET_UNITS+=gameunit
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_UNITS+=gameunit
 endif
@@ -866,22 +857,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_UNITS+=gameunit
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-override TARGET_UNITS+=gameunit
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_UNITS+=gameunit
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 override TARGET_UNITS+=gameunit
 endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_UNITS+=gameunit
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 override TARGET_UNITS+=gameunit
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_UNITS+=gameunit
 endif
 ifdef REQUIRE_UNITSDIR
@@ -1086,7 +1068,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -1224,14 +1205,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1635,7 +1616,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1650,7 +1631,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1728,9 +1709,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1752,6 +1730,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1809,22 +1790,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1916,16 +1888,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -2043,7 +2006,7 @@ fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -2072,7 +2035,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -2103,7 +2066,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -2146,15 +2108,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -2223,14 +2183,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -2254,9 +2212,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -2277,14 +2234,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/linux/Makefile b/demo/linux/Makefile
index f451cd73..de8a3a9a 100644
--- a/demo/linux/Makefile
+++ b/demo/linux/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -365,12 +365,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_PROGRAMS+=epoll-pipe
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_PROGRAMS+=epoll-pipe
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override TARGET_PROGRAMS+=epoll-pipe
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -573,7 +567,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -711,14 +704,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1122,7 +1115,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1137,7 +1130,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1215,9 +1208,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1239,6 +1229,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1296,22 +1289,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1403,16 +1387,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1521,7 +1496,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1550,7 +1525,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1581,7 +1556,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1624,15 +1598,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1701,14 +1673,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1732,9 +1702,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1755,14 +1724,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/lister/Makefile b/demo/lister/Makefile
index d39a7e42..4f87f18b 100644
--- a/demo/lister/Makefile
+++ b/demo/lister/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -413,7 +413,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_PROGRAMS+=lister
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 override TARGET_PROGRAMS+=lister
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -428,7 +428,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_PROGRAMS+=lister
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 override TARGET_PROGRAMS+=lister
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -506,9 +506,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=lister
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_PROGRAMS+=lister
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=lister
 endif
@@ -530,6 +527,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_PROGRAMS+=lister
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+override TARGET_PROGRAMS+=lister
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=lister
 endif
@@ -587,22 +587,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_PROGRAMS+=lister
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-override TARGET_PROGRAMS+=lister
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_PROGRAMS+=lister
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_PROGRAMS+=lister
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
+ifeq ($(FULL_TARGET),aarch64-ios)
 override TARGET_PROGRAMS+=lister
 endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 override TARGET_PROGRAMS+=lister
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_PROGRAMS+=lister
 endif
 ifeq ($(FULL_TARGET),i386-linux)
@@ -689,7 +680,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_UNITS+=flist
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 override TARGET_UNITS+=flist
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -704,7 +695,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_UNITS+=flist
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 override TARGET_UNITS+=flist
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -782,9 +773,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_UNITS+=flist
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=flist
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_UNITS+=flist
 endif
@@ -806,6 +794,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_UNITS+=flist
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+override TARGET_UNITS+=flist
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_UNITS+=flist
 endif
@@ -863,22 +854,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_UNITS+=flist
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-override TARGET_UNITS+=flist
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_UNITS+=flist
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 override TARGET_UNITS+=flist
 endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_UNITS+=flist
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 override TARGET_UNITS+=flist
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_UNITS+=flist
 endif
 ifdef REQUIRE_UNITSDIR
@@ -1083,7 +1065,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -1221,14 +1202,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1632,7 +1613,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1647,7 +1628,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1725,9 +1706,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1749,6 +1727,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1806,22 +1787,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1913,16 +1885,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -2040,7 +2003,7 @@ fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -2069,7 +2032,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -2100,7 +2063,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -2143,15 +2105,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -2220,14 +2180,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -2251,9 +2209,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -2274,14 +2231,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/modex/Makefile b/demo/modex/Makefile
index 9d8224bc..aaacf0df 100644
--- a/demo/modex/Makefile
+++ b/demo/modex/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -534,7 +534,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -672,14 +671,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1083,7 +1082,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1098,7 +1097,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1176,9 +1175,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1200,6 +1196,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1257,22 +1256,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1364,16 +1354,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1482,7 +1463,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1511,7 +1492,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1542,7 +1523,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1585,15 +1565,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1662,14 +1640,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1693,9 +1669,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1716,14 +1691,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/morphos/Makefile b/demo/morphos/Makefile
index bb65301c..ad0ff8d8 100644
--- a/demo/morphos/Makefile
+++ b/demo/morphos/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -534,7 +534,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -672,14 +671,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1083,7 +1082,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1098,7 +1097,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1176,9 +1175,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1200,6 +1196,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1257,22 +1256,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1364,16 +1354,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1482,7 +1463,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1511,7 +1492,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1542,7 +1523,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1585,15 +1565,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1662,14 +1640,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1693,9 +1669,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1716,14 +1691,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/netware/Makefile b/demo/netware/Makefile
index c758921c..d5153e8c 100644
--- a/demo/netware/Makefile
+++ b/demo/netware/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -534,7 +534,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -672,14 +671,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1083,7 +1082,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1098,7 +1097,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1176,9 +1175,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1200,6 +1196,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1257,22 +1256,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1364,16 +1354,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1482,7 +1463,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1511,7 +1492,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1542,7 +1523,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1585,15 +1565,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1662,14 +1640,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1693,9 +1669,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1716,14 +1691,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/netwlibc/Makefile b/demo/netwlibc/Makefile
index 4a5489e7..8ee16f11 100644
--- a/demo/netwlibc/Makefile
+++ b/demo/netwlibc/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -535,7 +535,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -673,14 +672,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1084,7 +1083,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1099,7 +1098,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1177,9 +1176,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1201,6 +1197,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1258,22 +1257,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1365,16 +1355,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1483,7 +1464,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1512,7 +1493,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1543,7 +1524,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1586,15 +1566,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1663,14 +1641,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1694,9 +1670,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1717,14 +1692,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/os2/Makefile b/demo/os2/Makefile
index c7b990f1..edc0f5d2 100644
--- a/demo/os2/Makefile
+++ b/demo/os2/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -534,7 +534,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -672,14 +671,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1083,7 +1082,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1098,7 +1097,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1176,9 +1175,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1200,6 +1196,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1257,22 +1256,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1364,16 +1354,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1482,7 +1463,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1511,7 +1492,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1542,7 +1523,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1585,15 +1565,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1662,14 +1640,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1693,9 +1669,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1716,14 +1691,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/text/Makefile b/demo/text/Makefile
index 5e63fe96..ddc2f8b3 100644
--- a/demo/text/Makefile
+++ b/demo/text/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -413,7 +413,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -428,7 +428,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -506,9 +506,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
@@ -530,6 +527,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
@@ -587,22 +587,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
+ifeq ($(FULL_TARGET),aarch64-ios)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines
 endif
 ifdef REQUIRE_UNITSDIR
@@ -807,7 +798,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -945,14 +935,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1356,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1371,7 +1361,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1449,9 +1439,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1473,6 +1460,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1530,22 +1520,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1637,16 +1618,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1755,7 +1727,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1784,7 +1756,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1815,7 +1787,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1858,15 +1829,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1935,14 +1904,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1966,9 +1933,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1989,14 +1955,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/unix/Makefile b/demo/unix/Makefile
index 273a6463..b29b5935 100644
--- a/demo/unix/Makefile
+++ b/demo/unix/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -413,7 +413,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -428,7 +428,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -506,9 +506,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_PROGRAMS+=cgibmp daemon
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
@@ -530,6 +527,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+override TARGET_PROGRAMS+=cgibmp daemon
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
@@ -587,22 +587,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
+ifeq ($(FULL_TARGET),aarch64-ios)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-override TARGET_PROGRAMS+=cgibmp daemon
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_PROGRAMS+=cgibmp daemon
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_PROGRAMS+=cgibmp daemon
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_PROGRAMS+=cgibmp daemon
 endif
 ifdef REQUIRE_UNITSDIR
@@ -807,7 +798,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -945,14 +935,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1356,7 +1346,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1371,7 +1361,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1449,9 +1439,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1473,6 +1460,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1530,22 +1520,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1637,16 +1618,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1755,7 +1727,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1784,7 +1756,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1815,7 +1787,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1858,15 +1829,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1935,14 +1904,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1966,9 +1933,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1989,14 +1955,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/demo/win32/Makefile b/demo/win32/Makefile
index 81738eb6..234e287a 100644
--- a/demo/win32/Makefile
+++ b/demo/win32/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -269,8 +269,8 @@ endif
 ifndef CROSSBINDIR
 CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
-ifeq ($(OS_SOURCE),darwin)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
+ifneq ($(findstring $(OS_SOURCE),darwin ios),)
 DARWIN2DARWIN=1
 endif
 endif
@@ -537,7 +537,6 @@ EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -675,14 +674,14 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nwl
 IMPORTLIBPREFIX=imp
 endif
-ifeq ($(OS_TARGET),macos)
+ifeq ($(OS_TARGET),macosclassic)
 BATCHEXT=
 EXEEXT=
 DEBUGSYMEXT=.xcoff
 SHORTSUFFIX=mac
 IMPORTLIBPREFIX=imp
 endif
-ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
+ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
@@ -1086,7 +1085,7 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-macos)
+ifeq ($(FULL_TARGET),m68k-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -1101,7 +1100,7 @@ endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-macos)
+ifeq ($(FULL_TARGET),powerpc-macosclassic)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -1179,9 +1178,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1203,6 +1199,9 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),arm-ios)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1260,22 +1259,13 @@ endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),sparc64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
+ifeq ($(FULL_TARGET),aarch64-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
+ifeq ($(FULL_TARGET),wasm-wasm)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
+ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1367,16 +1357,7 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
 FPCCPUOPT:=-O2
-endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
@@ -1485,7 +1466,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -1514,7 +1495,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -1545,7 +1526,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -1588,15 +1568,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -1665,14 +1643,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1696,9 +1672,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1719,14 +1694,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/fpcdocs b/fpcdocs
new file mode 160000
index 00000000..60407b0f
--- /dev/null
+++ b/fpcdocs
@@ -0,0 +1 @@
+Subproject commit 60407b0f23bdcfee4596ce02e6c3c6d522cf6c08
diff --git a/fpcsrc b/fpcsrc
new file mode 160000
index 00000000..8066a5b4
--- /dev/null
+++ b/fpcsrc
@@ -0,0 +1 @@
+Subproject commit 8066a5b4ffc35f14757aa08e92cb2355c89c596f
diff --git a/install/bingo32/aslddos/ar.exe b/install/bingo32/aslddos/ar.exe
old mode 100644
new mode 100755
index cc1ccd84..2cca79ca
Binary files a/install/bingo32/aslddos/ar.exe and b/install/bingo32/aslddos/ar.exe differ
diff --git a/install/bingo32/aslddos/as.exe b/install/bingo32/aslddos/as.exe
old mode 100644
new mode 100755
index beebbe50..53d363b3
Binary files a/install/bingo32/aslddos/as.exe and b/install/bingo32/aslddos/as.exe differ
diff --git a/install/bingo32/aslddos/ld.exe b/install/bingo32/aslddos/ld.exe
old mode 100644
new mode 100755
index 365cf6f0..d25a628e
Binary files a/install/bingo32/aslddos/ld.exe and b/install/bingo32/aslddos/ld.exe differ
diff --git a/install/bingo32/aslddos/nm.exe b/install/bingo32/aslddos/nm.exe
old mode 100644
new mode 100755
index 534c7354..e451daf5
Binary files a/install/bingo32/aslddos/nm.exe and b/install/bingo32/aslddos/nm.exe differ
diff --git a/install/bingo32/aslddos/objdump.exe b/install/bingo32/aslddos/objdump.exe
old mode 100644
new mode 100755
index d9c450a2..2683c4af
Binary files a/install/bingo32/aslddos/objdump.exe and b/install/bingo32/aslddos/objdump.exe differ
diff --git a/install/bingo32/aslddos/strip.exe b/install/bingo32/aslddos/strip.exe
old mode 100644
new mode 100755
index 533bcc90..f777b26b
Binary files a/install/bingo32/aslddos/strip.exe and b/install/bingo32/aslddos/strip.exe differ
diff --git a/install/bingo32/cwsdpmi.exe b/install/bingo32/cwsdpmi.exe
old mode 100644
new mode 100755
diff --git a/install/bingo32/cwsdstub.exe b/install/bingo32/cwsdstub.exe
old mode 100644
new mode 100755
diff --git a/install/bingo32/cwsparam.exe b/install/bingo32/cwsparam.exe
old mode 100644
new mode 100755
diff --git a/install/bingo32/gdbdos/gdb.exe b/install/bingo32/gdbdos/gdb.exe
old mode 100644
new mode 100755
index 50b9cdd6..540d2882
Binary files a/install/bingo32/gdbdos/gdb.exe and b/install/bingo32/gdbdos/gdb.exe differ
diff --git a/install/bingo32/makedos/cmp.exe b/install/bingo32/makedos/cmp.exe
old mode 100644
new mode 100755
index cc51eb9f..85e78a68
Binary files a/install/bingo32/makedos/cmp.exe and b/install/bingo32/makedos/cmp.exe differ
diff --git a/install/bingo32/makedos/cp.exe b/install/bingo32/makedos/cp.exe
old mode 100644
new mode 100755
index d959c002..684d2b4a
Binary files a/install/bingo32/makedos/cp.exe and b/install/bingo32/makedos/cp.exe differ
diff --git a/install/bingo32/makedos/diff.exe b/install/bingo32/makedos/diff.exe
old mode 100644
new mode 100755
index 020f586b..dd5ef0eb
Binary files a/install/bingo32/makedos/diff.exe and b/install/bingo32/makedos/diff.exe differ
diff --git a/install/bingo32/makedos/gdate.exe b/install/bingo32/makedos/gdate.exe
old mode 100644
new mode 100755
index 5ead5535..a781e2fb
Binary files a/install/bingo32/makedos/gdate.exe and b/install/bingo32/makedos/gdate.exe differ
diff --git a/install/bingo32/makedos/gecho.exe b/install/bingo32/makedos/gecho.exe
old mode 100644
new mode 100755
index 5722321a..131f72b6
Binary files a/install/bingo32/makedos/gecho.exe and b/install/bingo32/makedos/gecho.exe differ
diff --git a/install/bingo32/makedos/ginstall.exe b/install/bingo32/makedos/ginstall.exe
old mode 100644
new mode 100755
index bf423cd6..21cc71fb
Binary files a/install/bingo32/makedos/ginstall.exe and b/install/bingo32/makedos/ginstall.exe differ
diff --git a/install/bingo32/makedos/gmkdir.exe b/install/bingo32/makedos/gmkdir.exe
old mode 100644
new mode 100755
index c662ddbd..ee57904c
Binary files a/install/bingo32/makedos/gmkdir.exe and b/install/bingo32/makedos/gmkdir.exe differ
diff --git a/install/bingo32/makedos/grep.exe b/install/bingo32/makedos/grep.exe
old mode 100644
new mode 100755
index 0d700de9..f73da750
Binary files a/install/bingo32/makedos/grep.exe and b/install/bingo32/makedos/grep.exe differ
diff --git a/install/bingo32/makedos/make.exe b/install/bingo32/makedos/make.exe
old mode 100644
new mode 100755
index f17394cd..c2d7ab95
Binary files a/install/bingo32/makedos/make.exe and b/install/bingo32/makedos/make.exe differ
diff --git a/install/bingo32/makedos/mv.exe b/install/bingo32/makedos/mv.exe
old mode 100644
new mode 100755
index 6ab56afd..2b65d7d9
Binary files a/install/bingo32/makedos/mv.exe and b/install/bingo32/makedos/mv.exe differ
diff --git a/install/bingo32/makedos/patch.exe b/install/bingo32/makedos/patch.exe
old mode 100644
new mode 100755
index f87c2ccb..c51a52c9
Binary files a/install/bingo32/makedos/patch.exe and b/install/bingo32/makedos/patch.exe differ
diff --git a/install/bingo32/makedos/pwd.exe b/install/bingo32/makedos/pwd.exe
old mode 100644
new mode 100755
index 29d242b7..4b332d94
Binary files a/install/bingo32/makedos/pwd.exe and b/install/bingo32/makedos/pwd.exe differ
diff --git a/install/bingo32/makedos/rm.exe b/install/bingo32/makedos/rm.exe
old mode 100644
new mode 100755
index ed1a7f0c..1e7ee4da
Binary files a/install/bingo32/makedos/rm.exe and b/install/bingo32/makedos/rm.exe differ
diff --git a/install/bingo32/makedos/zip.exe b/install/bingo32/makedos/zip.exe
old mode 100644
new mode 100755
diff --git a/install/bingo32/utilities.txt b/install/bingo32/utilities.txt
index 2d9caff6..b1674332 100644
--- a/install/bingo32/utilities.txt
+++ b/install/bingo32/utilities.txt
@@ -7,7 +7,7 @@ directory current/v2gnu.
 zip.exe comes from Info-ZIP's Zip (http://www.info-zip.org).
 
 aslddos:
-Files from GNU binutils 2.17 (djgpp 2.03). Original file: bnu217b.zip
+Files from GNU binutils 2.31.1 (djgpp 2.05). Original file: bnu2311b.zip
  * ar.exe
  * as.exe
  * ld.exe
@@ -16,29 +16,29 @@ Files from GNU binutils 2.17 (djgpp 2.03). Original file: bnu217b.zip
  * strip.exe
 
 makedos:
-Files from GNU diffutils 2.8.7 (djgpp 2.03). Original file: dif287b.zip
+Files from GNU diffutils 3.7 (djgpp 2.05). Original file: dif37b.zip
  * diff.exe
  * cmp.exe
-Files from GNU sh-utils 2.0.11 (djgpp 2.03). Original file: shl2011b.zip
+Files from GNU sh-utils 2.0.11 (djgpp 2.05). Original file: shl2011br2.zip
  * gdate.exe   (renamed from date.exe)
  * gecho.exe   (renamed from echo.exe)
  * pwd.exe
-Files from GNU fileutils 4.1 (djgpp 2.03). Original file: fil41b.zip
+Files from GNU fileutils 4.1 (djgpp 2.05). Original file: fil41br2.zip
  * cp.exe
  * mv.exe
  * ginstall.exe
  * rm.exe
  * gmkdir.exe  (renamed from mkdir.exe)
-Files from GNU grep 2.5.3 (djgpp 2.03). Original file: grep253b.zip
+Files from GNU grep 2.28 (djgpp 2.05). Original file: grep228b.zip
  * grep.exe
-Files from GNU patch 2.5.9 (djgpp 2.03). Original file: pat259b.zip
+Files from GNU patch 2.7.5 (djgpp 2.05). Original file: pat275br2.zip
  * patch.exe
-Files from GNU make 3.79.1 (djgpp 2.03). Original file: mak3791b.zip
+Files from GNU make 4.2.1 (djgpp 2.05). Original file: mak421b.zip
  * make.exe
 Files from Info-ZIP's Zip 2.32. Original file: zip232x.zip
  * zip.exe
 
 gdbdos:
-Files from GNU gdb 6.1.1 (djgpp 2.03). Original file: gdb611b.zip
+Files from GNU gdb 8.0.1 (djgpp 2.05). Original file: gdb801b.zip
  * gdb.exe
 
diff --git a/install/binos2/asldos2/bin/os2/ar.exe b/install/binos2/asldos2/bin/os2/ar.exe
new file mode 100644
index 00000000..310d7a7b
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/ar.exe differ
diff --git a/install/binos2/asldos2/bin/os2/as.exe b/install/binos2/asldos2/bin/os2/as.exe
new file mode 100644
index 00000000..dda9b781
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/as.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emx.exe b/install/binos2/asldos2/bin/os2/emx.exe
new file mode 100644
index 00000000..2d9c9f1b
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emx.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxaout.exe b/install/binos2/asldos2/bin/os2/emxaout.exe
new file mode 100644
index 00000000..290c817a
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxaout.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxbind.exe b/install/binos2/asldos2/bin/os2/emxbind.exe
new file mode 100644
index 00000000..386db90b
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxbind.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxcat.exe b/install/binos2/asldos2/bin/os2/emxcat.exe
new file mode 100644
index 00000000..ce22acfe
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxcat.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxd.exe b/install/binos2/asldos2/bin/os2/emxd.exe
new file mode 100644
index 00000000..632886d1
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxd.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxfpemu b/install/binos2/asldos2/bin/os2/emxfpemu
new file mode 100644
index 00000000..1b3d88d3
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxfpemu differ
diff --git a/install/binos2/asldos2/bin/os2/emximp.exe b/install/binos2/asldos2/bin/os2/emximp.exe
new file mode 100644
index 00000000..cef34cf5
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emximp.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxl.exe b/install/binos2/asldos2/bin/os2/emxl.exe
new file mode 100644
index 00000000..375c6f22
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxl.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxload.exe b/install/binos2/asldos2/bin/os2/emxload.exe
new file mode 100644
index 00000000..de150d97
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxload.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxomf.exe b/install/binos2/asldos2/bin/os2/emxomf.exe
new file mode 100644
index 00000000..ec7f0c10
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxomf.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxrev.cmd b/install/binos2/asldos2/bin/os2/emxrev.cmd
new file mode 100644
index 00000000..e4ccaa35
--- /dev/null
+++ b/install/binos2/asldos2/bin/os2/emxrev.cmd
@@ -0,0 +1,132 @@
+/* emxrev.cmd -- Display revision numbers of emx DLLs
+   Copyright (c) 1993-1995 Eberhard Mattes
+
+This file is part of emx.
+
+emx is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+emx 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.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with emx; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+
+  call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
+  call SysLoadFuncs
+
+  parse arg arg1 rest
+  arg1 = strip( arg1, 'T')
+  rest = strip( rest, 'T')
+  select
+  when arg1 = '' then do
+    say revision( 'emx')
+    say revision( 'emxio')
+    say revision( 'emxlibc')
+    say revision( 'emxlibcm')
+    say revision( 'emxlibcs')
+    say revision( 'emxwrap')
+  end
+  when arg1 = '-a' then do
+    if rest \= '' then
+      call usage
+    call find_all
+  end
+  when arg1 = '-c' then do
+    if (rest = '') | (words( rest) > 1) then
+      call usage
+    parse var rest drive':'rest
+    if (length( drive) \= 1) | (rest \= '') then
+      call usage
+    call find_tree( drive':')
+  end
+  when arg1 = '-d' then do
+    if (rest = '') | (words( rest) > 1) then
+      call usage
+    call find_dir rest, 'S'
+  end
+  when arg1 = '-f' then do
+    if (rest = '') | (words( rest) > 1) then
+      call usage
+    say revision( rest)
+  end
+  when arg1 = '-p' then do
+    if (rest = '') | (words( rest) > 1) then
+      call usage
+    call find_config rest
+  end
+  otherwise
+    call usage
+  end
+  exit 0
+
+usage:
+  say 'Usage:'
+  say '  emxrev           Display revision number of default emx DLLs'
+  say '  emxrev -a        Scan all disks for emx DLLs'
+  say '  emxrev -c d:     Scan complete drive D: for emx DLLs'
+  say '  emxrev -d dir    Scan directory DIR for emx DLLs'
+  say '  emxrev -f file   Display revision number of FILE'
+  say '  emxrev -p file   Scan directories in LIBPATH statement of FILE'
+  say ''
+  say 'emx DLLs are emx.dll, emxio.dll, emxlibc.dll, emxlibcm.dll,'
+  say '             emxlibcs.dll, and emxwrap.dll.'
+exit 1
+
+find_all: procedure
+  drives = SysDriveMap()
+  do i = 1 to words( drives)
+    call find_tree( word( drives, i))
+  end
+  return
+
+find_tree: procedure
+  arg drive
+  call find_dir drive'\', 'S'
+  return
+
+find_dir: procedure
+  arg dir, opt
+  last = right( dir, 1)
+  if (last \= '/') & (last \= '\') & (last \= ':') then
+    dir = dir'\'
+  call SysFileTree dir'emx*.dll', files, 'FO'||opt
+  do i = 1 to files.0
+    name = translate( filespec( 'name', files.i))
+    if (name = 'EMX.DLL') | (name = 'EMXIO.DLL') | (name = 'EMXLIBC.DLL'),
+       | (name = 'EMXLIBCM.DLL') | (name = 'EMXLIBCS.DLL'),
+       | (name = 'EMXWRAP.DLL') then
+      say revision( files.i)
+  end
+  return
+  
+find_config: procedure
+  arg config
+  call SysFileSearch 'LIBPATH=', config, lines
+  do i = 1 to lines.0
+    parse var lines.i 'LIBPATH='rest
+    list = translate( rest, ' ', ';')
+    do j = 1 to words( list)
+      call find_dir word( list, j), ''
+    end
+  end
+  return
+
+revision: procedure
+  arg pathname
+  call RxFuncAdd emx_revision, pathname, emx_revision
+  signal on syntax name error
+  tmp = emx_revision()
+  signal off syntax
+  call RxFuncDrop emx_revision
+  return pathname ': revision =' tmp
+
+error:
+  return pathname ': revision number not available'
diff --git a/install/binos2/asldos2/bin/os2/emxstack.exe b/install/binos2/asldos2/bin/os2/emxstack.exe
new file mode 100644
index 00000000..672a9b0f
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxstack.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxupd.exe b/install/binos2/asldos2/bin/os2/emxupd.exe
new file mode 100644
index 00000000..694f2cba
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/emxupd.exe differ
diff --git a/install/binos2/asldos2/bin/os2/emxuzdll.cmd b/install/binos2/asldos2/bin/os2/emxuzdll.cmd
new file mode 100644
index 00000000..44bb4d06
--- /dev/null
+++ b/install/binos2/asldos2/bin/os2/emxuzdll.cmd
@@ -0,0 +1,23 @@
+@echo off
+if "%1"=="" goto usage
+if "%2"=="" goto usage
+if not "%3"=="" goto usage
+
+if exist *.dll goto exist
+unzip -j -C %1 *.dll
+if errorlevel 1 goto cleanup
+for %%f in (*.dll) do emxupd %%f %2
+:cleanup
+del *.dll 2>nul
+goto end
+
+:usage
+echo Usage:   emxuzdll ^<zip_file^> ^<dll_dir^>
+echo Example: emxuzdll a:\emxfix04.zip c:\emx\dll
+goto end
+
+:exist
+echo Sorry, there are DLL files in the current directory
+goto end
+
+:end
diff --git a/install/binos2/asldos2/bin/os2/gasp.exe b/install/binos2/asldos2/bin/os2/gasp.exe
new file mode 100644
index 00000000..c3048431
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/gasp.exe differ
diff --git a/install/binos2/asldos2/bin/os2/ld.exe b/install/binos2/asldos2/bin/os2/ld.exe
new file mode 100644
index 00000000..f166c33c
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/ld.exe differ
diff --git a/install/binos2/asldos2/bin/os2/nm.exe b/install/binos2/asldos2/bin/os2/nm.exe
new file mode 100644
index 00000000..6ba59446
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/nm.exe differ
diff --git a/install/binos2/asldos2/bin/os2/objcopy.exe b/install/binos2/asldos2/bin/os2/objcopy.exe
new file mode 100644
index 00000000..93d35ddd
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/objcopy.exe differ
diff --git a/install/binos2/asldos2/bin/os2/objdump.exe b/install/binos2/asldos2/bin/os2/objdump.exe
new file mode 100644
index 00000000..8e422773
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/objdump.exe differ
diff --git a/install/binos2/asldos2/bin/os2/ranlib.exe b/install/binos2/asldos2/bin/os2/ranlib.exe
new file mode 100644
index 00000000..c8e4edfa
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/ranlib.exe differ
diff --git a/install/binos2/asldos2/bin/os2/rsx.exe b/install/binos2/asldos2/bin/os2/rsx.exe
new file mode 100644
index 00000000..4deee19f
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/rsx.exe differ
diff --git a/install/binos2/asldos2/bin/os2/rsxopt.exe b/install/binos2/asldos2/bin/os2/rsxopt.exe
new file mode 100644
index 00000000..d117c5fe
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/rsxopt.exe differ
diff --git a/install/binos2/asldos2/bin/os2/size.exe b/install/binos2/asldos2/bin/os2/size.exe
new file mode 100644
index 00000000..1380281f
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/size.exe differ
diff --git a/install/binos2/asldos2/bin/os2/strip.exe b/install/binos2/asldos2/bin/os2/strip.exe
new file mode 100644
index 00000000..13b4cfe8
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/strip.exe differ
diff --git a/install/binos2/asldos2/bin/os2/touch.exe b/install/binos2/asldos2/bin/os2/touch.exe
new file mode 100644
index 00000000..6762bff4
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/touch.exe differ
diff --git a/install/binos2/asldos2/bin/os2/wrc.exe b/install/binos2/asldos2/bin/os2/wrc.exe
new file mode 100644
index 00000000..91d99df0
Binary files /dev/null and b/install/binos2/asldos2/bin/os2/wrc.exe differ
diff --git a/install/binos2/asldos2/book/emxrt.inf b/install/binos2/asldos2/book/emxrt.inf
new file mode 100644
index 00000000..1cb3a5b0
Binary files /dev/null and b/install/binos2/asldos2/book/emxrt.inf differ
diff --git a/install/binos2/asldos2/dll/bfd2e.dll b/install/binos2/asldos2/dll/bfd2e.dll
new file mode 100644
index 00000000..3dffd28b
Binary files /dev/null and b/install/binos2/asldos2/dll/bfd2e.dll differ
diff --git a/install/binos2/asldos2/dll/emx.dll b/install/binos2/asldos2/dll/emx.dll
new file mode 100644
index 00000000..342b073f
Binary files /dev/null and b/install/binos2/asldos2/dll/emx.dll differ
diff --git a/install/binos2/asldos2/dll/emxio.dll b/install/binos2/asldos2/dll/emxio.dll
new file mode 100644
index 00000000..18d89b94
Binary files /dev/null and b/install/binos2/asldos2/dll/emxio.dll differ
diff --git a/install/binos2/asldos2/dll/emxlibc.dll b/install/binos2/asldos2/dll/emxlibc.dll
new file mode 100644
index 00000000..5d68761e
Binary files /dev/null and b/install/binos2/asldos2/dll/emxlibc.dll differ
diff --git a/install/binos2/asldos2/dll/emxlibcm.dll b/install/binos2/asldos2/dll/emxlibcm.dll
new file mode 100644
index 00000000..b9f6ab77
Binary files /dev/null and b/install/binos2/asldos2/dll/emxlibcm.dll differ
diff --git a/install/binos2/asldos2/dll/emxlibcs.dll b/install/binos2/asldos2/dll/emxlibcs.dll
new file mode 100644
index 00000000..b51c5dbf
Binary files /dev/null and b/install/binos2/asldos2/dll/emxlibcs.dll differ
diff --git a/install/binos2/asldos2/dll/emxwrap.dll b/install/binos2/asldos2/dll/emxwrap.dll
new file mode 100644
index 00000000..b6536b74
Binary files /dev/null and b/install/binos2/asldos2/dll/emxwrap.dll differ
diff --git a/install/binos2/asldos2/dll/iintl6i.dll b/install/binos2/asldos2/dll/iintl6i.dll
new file mode 100644
index 00000000..5efad94a
Binary files /dev/null and b/install/binos2/asldos2/dll/iintl6i.dll differ
diff --git a/install/binos2/asldos2/dll/libc05.dll b/install/binos2/asldos2/dll/libc05.dll
new file mode 100644
index 00000000..5ec6b9d7
Binary files /dev/null and b/install/binos2/asldos2/dll/libc05.dll differ
diff --git a/install/binos2/gdbos2/bin/os2/gdb.exe b/install/binos2/gdbos2/bin/os2/gdb.exe
new file mode 100644
index 00000000..22140230
Binary files /dev/null and b/install/binos2/gdbos2/bin/os2/gdb.exe differ
diff --git a/install/binos2/gdbos2/bin/os2/gprof.exe b/install/binos2/gdbos2/bin/os2/gprof.exe
new file mode 100644
index 00000000..b53924fc
Binary files /dev/null and b/install/binos2/gdbos2/bin/os2/gprof.exe differ
diff --git a/install/binos2/gdbos2/bin/os2/pmgdb.exe b/install/binos2/gdbos2/bin/os2/pmgdb.exe
new file mode 100644
index 00000000..829de95e
Binary files /dev/null and b/install/binos2/gdbos2/bin/os2/pmgdb.exe differ
diff --git a/install/binos2/gdbos2/bin/os2/pmgdb.hlp b/install/binos2/gdbos2/bin/os2/pmgdb.hlp
new file mode 100644
index 00000000..f0e3e9a4
Binary files /dev/null and b/install/binos2/gdbos2/bin/os2/pmgdb.hlp differ
diff --git a/install/binos2/makeos2/bin/os2/chmod.exe b/install/binos2/makeos2/bin/os2/chmod.exe
new file mode 100644
index 00000000..1f951684
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/chmod.exe differ
diff --git a/install/binos2/makeos2/bin/os2/cp.exe b/install/binos2/makeos2/bin/os2/cp.exe
new file mode 100644
index 00000000..e24af989
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/cp.exe differ
diff --git a/install/binos2/makeos2/bin/os2/dd.exe b/install/binos2/makeos2/bin/os2/dd.exe
new file mode 100644
index 00000000..fb74b1d1
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/dd.exe differ
diff --git a/install/binos2/makeos2/bin/os2/df.exe b/install/binos2/makeos2/bin/os2/df.exe
new file mode 100644
index 00000000..b811c645
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/df.exe differ
diff --git a/install/binos2/makeos2/bin/os2/diff.exe b/install/binos2/makeos2/bin/os2/diff.exe
new file mode 100644
index 00000000..2961c8ef
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/diff.exe differ
diff --git a/install/binos2/makeos2/bin/os2/dir.exe b/install/binos2/makeos2/bin/os2/dir.exe
new file mode 100644
index 00000000..73016fe2
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/dir.exe differ
diff --git a/install/binos2/makeos2/bin/os2/du.exe b/install/binos2/makeos2/bin/os2/du.exe
new file mode 100644
index 00000000..7c9c973e
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/du.exe differ
diff --git a/install/binos2/makeos2/bin/os2/gdate.exe b/install/binos2/makeos2/bin/os2/gdate.exe
new file mode 100644
index 00000000..85873226
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/gdate.exe differ
diff --git a/install/binos2/makeos2/bin/os2/ginstall.exe b/install/binos2/makeos2/bin/os2/ginstall.exe
new file mode 100644
index 00000000..07188a52
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/ginstall.exe differ
diff --git a/install/binos2/makeos2/bin/os2/ls.exe b/install/binos2/makeos2/bin/os2/ls.exe
new file mode 100644
index 00000000..e6f319ad
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/ls.exe differ
diff --git a/install/binos2/makeos2/bin/os2/make.exe b/install/binos2/makeos2/bin/os2/make.exe
new file mode 100644
index 00000000..76564edc
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/make.exe differ
diff --git a/install/binos2/makeos2/bin/os2/mkdir.exe b/install/binos2/makeos2/bin/os2/mkdir.exe
new file mode 100644
index 00000000..28870157
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/mkdir.exe differ
diff --git a/install/binos2/makeos2/bin/os2/mv.exe b/install/binos2/makeos2/bin/os2/mv.exe
new file mode 100644
index 00000000..11365c2a
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/mv.exe differ
diff --git a/install/binos2/makeos2/bin/os2/pwd.exe b/install/binos2/makeos2/bin/os2/pwd.exe
new file mode 100644
index 00000000..5a72c3b1
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/pwd.exe differ
diff --git a/install/binos2/makeos2/bin/os2/rm.exe b/install/binos2/makeos2/bin/os2/rm.exe
new file mode 100644
index 00000000..e824ada0
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/rm.exe differ
diff --git a/install/binos2/makeos2/bin/os2/rmdir.exe b/install/binos2/makeos2/bin/os2/rmdir.exe
new file mode 100644
index 00000000..43de17dd
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/rmdir.exe differ
diff --git a/install/binos2/makeos2/bin/os2/vdir.exe b/install/binos2/makeos2/bin/os2/vdir.exe
new file mode 100644
index 00000000..6fafcf2b
Binary files /dev/null and b/install/binos2/makeos2/bin/os2/vdir.exe differ
diff --git a/install/binos2/makeos2/dll/gnufu.dll b/install/binos2/makeos2/dll/gnufu.dll
new file mode 100644
index 00000000..bd8ec5e4
Binary files /dev/null and b/install/binos2/makeos2/dll/gnufu.dll differ
diff --git a/install/binos2/makeos2/dll/gnuintl.dll b/install/binos2/makeos2/dll/gnuintl.dll
new file mode 100644
index 00000000..4dc0c017
Binary files /dev/null and b/install/binos2/makeos2/dll/gnuintl.dll differ
diff --git a/install/binos2/makeos2/dll/gnuregex.dll b/install/binos2/makeos2/dll/gnuregex.dll
new file mode 100644
index 00000000..f52fbee0
Binary files /dev/null and b/install/binos2/makeos2/dll/gnuregex.dll differ
diff --git a/install/binos2/makeos2/dll/gnushu.dll b/install/binos2/makeos2/dll/gnushu.dll
new file mode 100644
index 00000000..f3e63c9b
Binary files /dev/null and b/install/binos2/makeos2/dll/gnushu.dll differ
diff --git a/install/binos2/makeos2/doc/chmod.1 b/install/binos2/makeos2/doc/chmod.1
new file mode 100644
index 00000000..b5842c34
--- /dev/null
+++ b/install/binos2/makeos2/doc/chmod.1
@@ -0,0 +1,84 @@
+.TH CHMOD 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+chmod \- change the access permissions of files
+.SH SYNOPSIS
+.B chmod
+[\-Rcfv] [\-\-recursive] [\-\-changes]
+[\-\-silent] [\-\-quiet] [\-\-verbose] [\-\-help] [\-\-version] mode file...
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR chmod .
+.B chmod
+changes the permissions of each given file according to
+.IR mode ,
+which can be either a symbolic representation of changes to make, or
+an octal number representing the bit pattern for the new permissions.
+.PP
+The format of a symbolic mode is
+`[ugoa...][[+-=][rwxXstugo...]...][,...]'.  Multiple symbolic
+operations can be given, separated by commas.
+.PP
+A combination of the letters `ugoa' controls which users' access to
+the file will be changed: the user who owns it (u), other users in the
+file's group (g), other users not in the file's group (o), or all
+users (a).  If none of these are given, the effect is as if `a' were
+given, but bits that are set in the umask are not affected.
+.PP
+The operator `+' causes the permissions selected to be added to the
+existing permissions of each file; `-' causes them to be removed; and
+`=' causes them to be the only permissions that the file has.
+.PP
+The letters `rwxXstugo' select the new permissions for the affected
+users: read (r), write (w), execute (or access for directories) (x),
+execute only if the file is a directory or already has execute
+permission for some user (X), set user or group ID on execution (s),
+save program text on swap device (t), the permissions that the user
+who owns the file currently has for it (u), the permissions that other
+users in the file's group have for it (g), and the permissions that
+other users not in the file's group have for it (o).
+.PP
+A numeric mode is from one to four octal digits (0-7), derived by
+adding up the bits with values 4, 2, and 1.  Any omitted digits are
+assumed to be leading zeros.  The first digit selects the set user ID
+(4) and set group ID (2) and save text image (1) attributes.  The
+second digit selects permissions for the user who owns the file: read
+(4), write (2), and execute (1); the third selects permissions for
+other users in the file's group, with the same values; and the fourth
+for other users not in the file's group, with the same values.
+.PP
+.B chmod
+never changes the permissions of symbolic links; the
+.B chmod
+system call cannot change their permissions.  This is not a problem
+since the permissions of symbolic links are never used.
+However, for each symbolic link listed on the command line,
+.B chmod
+changes the permissions of the pointed-to file.
+In contrast,
+.B chmod
+ignores symbolic links encountered during recursive directory
+traversals.
+.SS OPTIONS
+.TP
+.I "\-c, \-\-changes"
+Verbosely describe only files whose permissions actually change.
+.TP
+.I "\-f, \-\-silent, \-\-quiet"
+Do not print error messages about files whose permissions cannot be
+changed.
+.TP
+.I "\-v, \-\-verbose"
+Verbosely describe changed permissions.
+.TP
+.I "\-R, \-\-recursive"
+Recursively change permissions of directories and their contents.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
diff --git a/install/binos2/makeos2/doc/cp.1 b/install/binos2/makeos2/doc/cp.1
new file mode 100644
index 00000000..84615f68
--- /dev/null
+++ b/install/binos2/makeos2/doc/cp.1
@@ -0,0 +1,131 @@
+.TH CP 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+cp \- copy files
+.SH SYNOPSIS
+.B cp
+[options] source dest
+.br
+.B cp
+[options] source... directory
+.br
+Options:
+.br
+[\-abdfilprsuvxPR] [\-S backup-suffix] [\-V {numbered,existing,simple}]
+[\-\-backup] [\-\-no-dereference] [\-\-force] [\-\-interactive]
+[\-\-one-file-system] [\-\-preserve] [\-\-recursive] [\-\-update]
+[\-\-verbose] [\-\-suffix=backup-suffix]
+[\-\-version-control={numbered,existing,simple}] [\-\-archive] [\-\-parents]
+[\-\-link] [\-\-symbolic-link] [\-\-help] [\-\-version]
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR cp .
+If the last argument names an existing directory,
+.B cp
+copies each other given file into a file with the same name in that
+directory.  Otherwise, if only two files are given, it copies the
+first onto the second.  It is an error if the last argument is not a
+directory and more than two files are given.  By default, it does not
+copy directories.
+.SS OPTIONS
+.TP
+.I "\-a, \-\-archive"
+Preserve as much as possible of the structure and attributes of the
+original files in the copy.  The same as
+.IR \-dpR .
+.TP
+.I "\-b, \-\-backup"
+Make backups of files that are about to be overwritten or removed.
+.TP
+.I "\-d, \-\-no-dereference"
+Copy symbolic links as symbolic links rather than copying the files
+that they point to, and preserve hard link relationships between
+source files in the copies.
+.TP
+.I "\-f, \-\-force"
+Remove existing destination files.
+.TP
+.I "\-i, \-\-interactive"
+Prompt whether to overwrite existing regular destination files.
+.TP
+.I "\-l, \-\-link"
+Make hard links instead of copies of non-directories.
+.TP
+.I "\-P, \-\-parents"
+Form the name of each destination file by appending to the target
+directory a slash and the specified name of the source file.  The last
+argument given to
+.B cp
+must be the name of an existing directory.  For example, the command
+`cp \-\-parents a/b/c existing_dir' copies the file
+.I a/b/c
+to
+.I existing_dir/a/b/c,
+creating any missing intermediate directories.
+.TP
+.I "\-p, \-\-preserve"
+Preserve the original files' owner, group, permissions, and timestamps.
+.TP
+.I \-r
+Copy directories recursively, copying all non-directories as if they
+were regular files.
+.TP
+.I "\-s, \-\-symbolic-link"
+Make symbolic links instead of copies of non-directories.
+All source filenames must be absolute (starting with `/')
+unless the destination files are in the current directory.
+This option produces an error message on systems that do not support
+symbolic links.
+.TP
+.I "\-u, \-\-update"
+Do not copy a nondirectory that has an existing destination with the
+same or newer modification time.
+.TP
+.I "\-v, \-\-verbose"
+Print the name of each file before copying it.
+.TP
+.I "\-x, \-\-one-file-system"
+Skip subdirectories that are on different filesystems from the one
+that the copy started on.
+.TP
+.I "\-R, \-\-recursive"
+Copy directories recursively.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
+.TP
+.I "\-S, \-\-suffix backup-suffix"
+The suffix used for making simple backup files can be set with the
+.B SIMPLE_BACKUP_SUFFIX
+environment variable, which can be overridden by this option.  If
+neither of those is given, the default is `~', as it is in Emacs.
+.TP
+.I "\-V, \-\-version-control {numbered,existing,simple}"
+The type of backups made can be set with the
+.B VERSION_CONTROL
+environment variable, which can be overridden by this option.  If
+.B VERSION_CONTROL
+is not set and this option is not given, the default backup type is
+`existing'.  The value of the
+.B VERSION_CONTROL
+environment variable and the argument to this option are like the GNU
+Emacs `version-control' variable; they also recognize synonyms that
+are more descriptive.  The valid values are (unique abbreviations are
+accepted):
+.RS
+.TP
+`t' or `numbered'
+Always make numbered backups.
+.TP
+`nil' or `existing'
+Make numbered backups of files that already
+have them, simple backups of the others.
+.TP
+`never' or `simple'
+Always make simple backups.
diff --git a/install/binos2/makeos2/doc/date.1 b/install/binos2/makeos2/doc/date.1
new file mode 100644
index 00000000..741b5600
--- /dev/null
+++ b/install/binos2/makeos2/doc/date.1
@@ -0,0 +1,177 @@
+.TH DATE 1L "GNU Shell Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+date \- print or set the system date and time
+.SH SYNOPSIS
+.B date
+[\-u] [\-d datestr] [\-s datestr] [\-\-utc] [\-\-universal]
+[\-\-date=datestr] [\-\-set=datestr] [\-\-help] [\-\-version]
+[+FORMAT] [MMDDhhmm[[CC]YY][.ss]]
+
+.SH DESCRIPTION
+This manual page
+documents the GNU version of
+.BR date .
+.B date
+with no arguments prints the current time and date (in the format
+of the `%c' directive described below).
+If given an argument that starts with a `+', it prints the current
+time and date in a format controlled by that argument, which has the
+same format as the format string passed to the `strftime' function.
+Except for directives that start with `%', characters in that string
+are printed unchanged.
+.PP
+The directives are:
+.IP %
+a literal %
+.IP n
+a newline
+.IP t
+a horizontal tab
+.PP
+Time fields:
+.IP %H
+hour (00..23)
+.IP %I
+hour (01..12)
+.IP %k
+hour ( 0..23)
+.IP %l
+hour ( 1..12)
+.IP %M
+minute (00..59)
+.IP %p
+locale's AM or PM
+.IP %r
+time, 12-hour (hh:mm:ss [AP]M)
+.IP %s
+seconds since 1970-01-01 00:00:00 UTC (a nonstandard extension)
+.IP %S
+second (00..61)
+.IP %T
+time, 24-hour (hh:mm:ss)
+.IP %X
+locale's time representation (%H:%M:%S)
+.IP %Z
+time zone (e.g., EDT), or nothing if no time zone is determinable
+.PP
+Date fields:
+.IP %a
+locale's abbreviated weekday name (Sun..Sat)
+.IP %A
+locale's full weekday name, variable length (Sunday..Saturday)
+.IP %b
+locale's abbreviated month name (Jan..Dec)
+.IP %B
+locale's full month name, variable length (January..December)
+.IP %c
+locale's date and time (Sat Nov 04 12:02:33 EST 1989)
+.IP %d
+day of month (01..31)
+.IP %D
+date (mm/dd/yy)
+.IP %h
+same as %b
+.IP %j
+day of year (001..366)
+.IP %m
+month (01..12)
+.IP %U
+week number of year with Sunday as first day of week (00..53)
+.IP %w
+day of week (0..6) with 0 corresponding to Sunday
+.IP %W
+week number of year with Monday as first day of week (00..53)
+.IP %x
+locale's date representation (mm/dd/yy)
+.IP %y
+last two digits of year (00..99)
+.IP %Y
+year (1970...)
+.PP
+By default, 
+.BR date
+pads numeric fields with zeroes.
+GNU
+.BR date
+recognizes the following nonstandard numeric modifiers:
+.IP \-
+(hyphen) do not pad the field
+.IP _
+(underscore) pad the field with spaces
+.PP
+If given an argument that does not start with `+',
+.B date
+sets the system clock to the time and date specified by that argument.
+The argument must consist entirely of digits, which have the following
+meaning:
+.IP MM
+month
+.IP DD
+day within month
+.IP hh
+hour
+.IP mm
+minute
+.IP CC
+first two digits of year (optional)
+.IP YY
+last two digits of year (optional)
+.IP ss
+second (optional)
+.PP
+Only the superuser can set the system clock.
+.SS OPTIONS
+.TP
+.I "\-d datestr, \-\-date datestr"
+Display the time and date specified in
+.IR datestr ,
+which can be in almost any common format.  The display is in
+the default output format, or if an argument starting with `+' is
+given to
+.BR date ,
+in the format specified by that argument.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-s datestr, \-\-set datestr"
+Set the time and date to
+.IR datestr ,
+which can be in almost any common format.
+It can contain month names, timezones, `am' and `pm', etc.
+.TP
+.I "\-u, \-\-universal"
+Print or set the time and date in Coordinated Universal Time (also
+known as Greenwich Mean Time) instead of in local (wall clock) time.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
+.SH EXAMPLES
+.PP
+To print the date of the day before yesterday
+.IP
+date \-\-date \'2 days ago\'
+.PP
+To print the date of the day three months and one day hence
+.IP
+date \-\-date \'3 months 1 day\'
+.PP
+To print the day of year of Christmas in the current year
+.IP
+date --date \'25 Dec\' +%j
+.PP
+To print the current date in a format including the full month name and
+the day of the month
+.IP
+date \'+%B %d\'
+.PP
+But this may not be what you want because for the first nine days
+of the month, the \`%d\' expands to a zero-padded two-digit field,
+for example \`date \-d 1-may \'+%B %d\'\' will print
+\`May 01\'.
+.PP
+To print the same date but without the leading zero for one-digit
+days of month, you can use the nonstandard \`\-\' modifier to suppress
+the padding altogether.
+.IP
+date \-d 1-may \'+%B %-d\'
diff --git a/install/binos2/makeos2/doc/dd.1 b/install/binos2/makeos2/doc/dd.1
new file mode 100644
index 00000000..a0f31505
--- /dev/null
+++ b/install/binos2/makeos2/doc/dd.1
@@ -0,0 +1,129 @@
+.TH DD 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+dd \- convert a file while copying it
+.SH SYNOPSIS
+.B dd
+[\-\-help] [\-\-version]
+[if=file] [of=file] [ibs=bytes] [obs=bytes] [bs=bytes] [cbs=bytes]
+[skip=blocks] [seek=blocks] [count=blocks]
+[conv={ascii,ebcdic,ibm,block,unblock,lcase,ucase,swab,noerror,notrunc,
+sync}]
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR dd .
+.B dd
+copies a file (from the standard input to the standard output, by
+default) with a user-selectable blocksize, while optionally performing
+conversions on it.
+.SS OPTIONS
+Numbers can be followed by a multiplier:
+.br
+b=512, c=1, k=1024, w=2, xm=number m
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
+.TP
+.I if=file
+Read from
+.I file
+instead of the standard input.
+.TP
+.I of=file
+Write to
+.I file
+instead of the standard output.
+Unless
+.I conv=notrunc
+is given, truncate
+.I file
+to the size specified by
+.I seek=
+(0 bytes if
+.I seek=
+is not given).
+.TP
+.I ibs=bytes
+Read
+.I bytes
+bytes at a time.
+.TP
+.I obs=bytes
+Write
+.I bytes
+bytes at a time.
+.TP
+.I bs=bytes
+Read and write
+.I bytes
+bytes at atime.  Override ibs and obs.
+.TP
+.I cbs=bytes
+Convert
+.I bytes
+bytes at a time.
+.TP
+.I skip=blocks
+Skip
+.I blocks
+ibs-sized blocks at start of input.
+.TP
+.I seek=blocks
+Skip
+.I blocks
+obs-sized blocks at start of output.
+.TP
+.I count=blocks
+Copy only
+.I blocks
+ibs-sized input blocks.
+.TP
+.I conv=conversion[,conversion...]
+Convert the file as specified by the
+.I conversion
+arguments.
+.RS
+Conversions:
+.TP
+ascii
+Convert EBCDIC to ASCII.
+.TP
+ebcdic
+Convert ASCII to EBCDIC.
+.TP
+ibm
+Convert ASCII to alternate EBCDIC.
+.TP
+block
+Pad newline-terminated records to size of cbs, replacing newline with
+trailing spaces.
+.TP
+unblock
+Replace trailing spaces in cbs-sized block with newline.
+.TP
+lcase
+Change uppercase characters to lowercase.
+.TP
+ucase
+Change lowercase characters to uppercase.
+.TP
+swab
+Swap every pair of input bytes.  Unlike the Unix dd, this works when
+an odd number of bytes are read.  If the input file contains an odd
+number of bytes, the last byte is simply copied (since there is
+nothing to swap it with).
+.TP
+noerror
+Continue after read errors.
+.TP
+notrunc
+Do not truncate the output file.
+.TP
+sync
+Pad every input block to size of ibs with trailing NULs.
diff --git a/install/binos2/makeos2/doc/df.1 b/install/binos2/makeos2/doc/df.1
new file mode 100644
index 00000000..4abdb46a
--- /dev/null
+++ b/install/binos2/makeos2/doc/df.1
@@ -0,0 +1,87 @@
+.TH DF 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+df \- summarize free disk space
+.SH SYNOPSIS
+.B df
+[\-aikPv] [\-t fstype] [\-x fstype] [\-\-all] [\-\-inodes]
+[\-\-type=fstype] [\-\-exclude\-type=fstype] [\-\-kilobytes]
+[\-\-portability] [\-\-print\-type] [\-\-help] [\-\-version] [filename...]
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR df .
+.B df
+displays the amount of disk space available on the filesystem
+containing each file name argument.  If no file name is given, the
+space available on all currently mounted filesystems is shown.  Disk
+space is shown in 1K blocks by default, unless the environment
+variable POSIXLY_CORRECT is set, in which case 512-byte blocks are
+used.
+.PP
+If an argument is the absolute file name of a disk device node containing a
+mounted filesystem,
+.B df
+shows the space available on that filesystem rather than on the
+filesystem containing the device node (which is always the root
+filesystem).  This version of
+.B df
+cannot show the space available on unmounted filesystems, because on
+most kinds of systems doing so requires very nonportable intimate
+knowledge of filesystem structures.
+.SS OPTIONS
+.TP
+.I "\-a, \-\-all"
+Include in the listing filesystems that have 0 blocks, which are
+omitted by default.  Such filesystems are typically special-purpose
+pseudo-filesystems, such as automounter entries.  On some systems,
+filesystems of type ``ignore'' or ``auto'' are also omitted by
+default and included in the listing by this option.
+.TP
+.I "\-i, \-\-inodes"
+List inode usage information instead of block usage.  An inode (short
+for ``index node'') is a special kind of disk block that contains
+information about a file, such as its owner, permissions, timestamps,
+and location on the disk.
+.TP
+.I "\-k, \-\-kilobytes"
+Print sizes in 1K blocks instead of 512-byte blocks.  This overrides
+the environment variable POSIXLY_CORRECT.
+.TP
+.I "\-P, \-\-portability"
+Use the POSIX output format.  This is like the default format except
+that the information about each filesystem is always printed on
+exactly one line; a mount device is never put on a line by itself.
+This means that if the mount device name is more than 20 characters
+long (as for some network mounts), the columns are misaligned.
+.TP
+.I "\-T, \-\-print\-type"
+Print a type string for each filesystem.  Any such printed filesystem
+type name may be used as an argument to either of the \-\-type= or
+\-\-exclude\-type= options.
+.TP
+.I "\-t, \-\-type=fstype"
+Limit the listing to filesystems of type
+.IR fstype .
+Multiple filesystem types can be shown by giving multiple
+.I \-t
+options.  By default, all filesystem types are listed.
+.TP
+.I "\-x, \-\-exclude\-type=fstype"
+Limit the listing to filesystems not of type
+.IR fstype .
+Multiple filesystem types can be eliminated by giving multiple
+.I \-x
+options.  By default, all filesystem types are listed.
+.TP
+.I \-v
+Ignored; for compatibility with System V versions of
+.BR df .
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
diff --git a/install/binos2/makeos2/doc/diff.1 b/install/binos2/makeos2/doc/diff.1
new file mode 100644
index 00000000..03fffedf
--- /dev/null
+++ b/install/binos2/makeos2/doc/diff.1
@@ -0,0 +1,225 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.27.
+.TH DIFF "1" "March 2002" "diffutils 2.8" "User Commands"
+.SH NAME
+diff \- compare files line by line
+.SH SYNOPSIS
+.B diff
+[\fIOPTION\fR]... \fIFILES\fR
+.SH DESCRIPTION
+Compare files line by line.
+.TP
+\fB\-i\fR  \fB\-\-ignore\-case\fR
+Ignore case differences in file contents.
+.TP
+\fB\-\-ignore\-file\-name\-case\fR
+Ignore case when comparing file names.
+.TP
+\fB\-\-no\-ignore\-file\-name\-case\fR
+Consider case when comparing file names.
+.TP
+\fB\-E\fR  \fB\-\-ignore\-tab\-expansion\fR
+Ignore changes due to tab expansion.
+.TP
+\fB\-b\fR  \fB\-\-ignore\-space\-change\fR
+Ignore changes in the amount of white space.
+.TP
+\fB\-w\fR  \fB\-\-ignore\-all\-space\fR
+Ignore all white space.
+.TP
+\fB\-B\fR  \fB\-\-ignore\-blank\-lines\fR
+Ignore changes whose lines are all blank.
+.TP
+\fB\-I\fR RE  \fB\-\-ignore\-matching\-lines\fR=\fIRE\fR
+Ignore changes whose lines all match RE.
+.TP
+\fB\-\-strip\-trailing\-cr\fR
+Strip trailing carriage return on input.
+.TP
+\fB\-a\fR  \fB\-\-text\fR
+Treat all files as text.
+.TP
+\fB\-c\fR  \fB\-C\fR NUM  \fB\-\-context\fR[=\fINUM\fR]
+Output NUM (default 3) lines of copied context.
+.TP
+\fB\-u\fR  \fB\-U\fR NUM  \fB\-\-unified\fR[=\fINUM\fR]
+Output NUM (default 3) lines of unified context.
+.TP
+\fB\-\-label\fR LABEL
+Use LABEL instead of file name.
+.TP
+\fB\-p\fR  \fB\-\-show\-c\-function\fR
+Show which C function each change is in.
+.TP
+\fB\-F\fR RE  \fB\-\-show\-function\-line\fR=\fIRE\fR
+Show the most recent line matching RE.
+.TP
+\fB\-q\fR  \fB\-\-brief\fR
+Output only whether files differ.
+.TP
+\fB\-e\fR  \fB\-\-ed\fR
+Output an ed script.
+.TP
+\fB\-\-normal\fR
+Output a normal diff.
+.TP
+\fB\-n\fR  \fB\-\-rcs\fR
+Output an RCS format diff.
+.TP
+\fB\-y\fR  \fB\-\-side\-by\-side\fR
+Output in two columns.
+.TP
+\fB\-W\fR NUM  \fB\-\-width\fR=\fINUM\fR
+Output at most NUM (default 130) print columns.
+.TP
+\fB\-\-left\-column\fR
+Output only the left column of common lines.
+.TP
+\fB\-\-suppress\-common\-lines\fR
+Do not output common lines.
+.TP
+\fB\-D\fR NAME  \fB\-\-ifdef\fR=\fINAME\fR
+Output merged file to show `#ifdef NAME' diffs.
+.TP
+\fB\-\-GTYPE\-group\-format\fR=\fIGFMT\fR
+Similar, but format GTYPE input groups with GFMT.
+.TP
+\fB\-\-line\-format\fR=\fILFMT\fR
+Similar, but format all input lines with LFMT.
+.TP
+\fB\-\-LTYPE\-line\-format\fR=\fILFMT\fR
+Similar, but format LTYPE input lines with LFMT.
+.TP
+LTYPE is `old', `new', or `unchanged'.
+GTYPE is LTYPE or `changed'.
+.IP
+GFMT may contain:
+.TP
+%<
+lines from FILE1
+.TP
+%>
+lines from FILE2
+.TP
+%=
+lines common to FILE1 and FILE2
+.TP
+%[-][WIDTH][.[PREC]]{doxX}LETTER
+printf-style spec for LETTER
+.IP
+LETTERs are as follows for new group, lower case for old group:
+.TP
+F
+first line number
+.TP
+L
+last line number
+.TP
+N
+number of lines = L-F+1
+.TP
+E
+F-1
+.TP
+M
+L+1
+.IP
+LFMT may contain:
+.TP
+%L
+contents of line
+.TP
+%l
+contents of line, excluding any trailing newline
+.TP
+%[-][WIDTH][.[PREC]]{doxX}n
+printf-style spec for input line number
+.IP
+Either GFMT or LFMT may contain:
+.TP
+%%
+%
+.TP
+%c'C'
+the single character C
+.TP
+%c'\eOOO'
+the character with octal code OOO
+.TP
+\fB\-l\fR  \fB\-\-paginate\fR
+Pass the output through `pr' to paginate it.
+.TP
+\fB\-t\fR  \fB\-\-expand\-tabs\fR
+Expand tabs to spaces in output.
+.TP
+\fB\-T\fR  \fB\-\-initial\-tab\fR
+Make tabs line up by prepending a tab.
+.TP
+\fB\-r\fR  \fB\-\-recursive\fR
+Recursively compare any subdirectories found.
+.TP
+\fB\-N\fR  \fB\-\-new\-file\fR
+Treat absent files as empty.
+.TP
+\fB\-\-unidirectional\-new\-file\fR
+Treat absent first files as empty.
+.TP
+\fB\-s\fR  \fB\-\-report\-identical\-files\fR
+Report when two files are the same.
+.TP
+\fB\-x\fR PAT  \fB\-\-exclude\fR=\fIPAT\fR
+Exclude files that match PAT.
+.TP
+\fB\-X\fR FILE  \fB\-\-exclude\-from\fR=\fIFILE\fR
+Exclude files that match any pattern in FILE.
+.TP
+\fB\-S\fR FILE  \fB\-\-starting\-file\fR=\fIFILE\fR
+Start with FILE when comparing directories.
+.TP
+\fB\-\-from\-file\fR=\fIFILE1\fR
+Compare FILE1 to all operands.  FILE1 can be a directory.
+.TP
+\fB\-\-to\-file\fR=\fIFILE2\fR
+Compare all operands to FILE2.  FILE2 can be a directory.
+.TP
+\fB\-\-horizon\-lines\fR=\fINUM\fR
+Keep NUM lines of the common prefix and suffix.
+.TP
+\fB\-d\fR  \fB\-\-minimal\fR
+Try hard to find a smaller set of changes.
+.TP
+\fB\-\-speed\-large\-files\fR
+Assume large files and many scattered small changes.
+.TP
+\fB\-v\fR  \fB\-\-version\fR
+Output version info.
+.TP
+\fB\-\-help\fR
+Output this help.
+.PP
+FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'.
+If \fB\-\-from\-file\fR or \fB\-\-to\-file\fR is given, there are no restrictions on FILES.
+If a FILE is `-', read standard input.
+.SH AUTHOR
+Written by Paul Eggert, Mike Haertel, David Hayes,
+Richard Stallman, and Len Tower.
+.SH "REPORTING BUGS"
+Report bugs to <bug-gnu-utils@gnu.org>.
+.SH COPYRIGHT
+Copyright \(co 2002 Free Software Foundation, Inc.
+.PP
+This program comes with NO WARRANTY, to the extent permitted by law.
+You may redistribute copies of this program
+under the terms of the GNU General Public License.
+For more information about these matters, see the file named COPYING.
+.SH "SEE ALSO"
+The full documentation for
+.B diff
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B diff
+programs are properly installed at your site, the command
+.IP
+.B info diff
+.PP
+should give you access to the complete manual.
diff --git a/install/binos2/makeos2/doc/du.1 b/install/binos2/makeos2/doc/du.1
new file mode 100644
index 00000000..d7f092d8
--- /dev/null
+++ b/install/binos2/makeos2/doc/du.1
@@ -0,0 +1,77 @@
+.TH DU 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+du \- summarize disk usage
+.SH SYNOPSIS
+.B du
+[\-abcklsxDLS] [\-\-all] [\-\-total] [\-\-count-links] [\-\-summarize]
+[\-\-bytes] [\-\-kilobytes] [\-\-one-file-system] [\-\-separate-dirs]
+[\-\-dereference] [\-\-dereference-args] [\-\-help] [\-\-version] [filename...]
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR du .
+.B du
+displays the amount of disk space used by each argument and for each
+subdirectory of directory arguments.  The space is measured in 1K
+blocks by default, unless the environment variable POSIXLY_CORRECT is
+set, in which case 512-byte blocks are used.
+.SS OPTIONS
+.TP
+.I "\-a, \-\-all"
+Display counts for all files, not just directories.
+.TP
+.I "\-b, \-\-bytes"
+Print sizes in bytes.
+.TP
+.I "\-c, \-\-total"
+Write a grand total of all of the arguments after all
+arguments have been processed.  This can be used to find
+out the disk usage of a directory, with some files excluded.
+.TP
+.I "\-k, \-\-kilobytes"
+Print sizes in kilobytes.  This overrides the environment variable
+POSIXLY_CORRECT.
+.TP
+.I "\-l, \-\-count-links"
+Count the size of all files, even if they have appeared already in
+another hard link.
+.TP
+.I "\-s, \-\-summarize"
+Display only a total for each argument.
+.TP
+.I "\-x, \-\-one-file-system"
+Skip directories that are on different filesystems from the one that
+the argument being processed is on.
+.TP
+.I "\-D, \-\-dereference-args"
+Dereference symbolic links that are command line arguments.  Does not
+affect other symbolic links.  This is helpful for finding out the disk
+usage of directories like /usr/tmp where they are symbolic links.
+.TP
+.I "\-L, \-\-dereference"
+Dereference symbolic links (show the disk space used by the file or
+directory that the link points to instead of the space used by the
+link).
+.TP
+.I "\-S, \-\-separate-dirs"
+Count the size of each directory separately, not including the sizes
+of subdirectories.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
+.SH BUGS
+On BSD systems,
+.B du
+reports sizes that are half the correct values for files that are
+NFS-mounted from HP-UX systems.  On HP-UX systems, it reports sizes
+that are twice the correct values for files that are NFS-mounted from
+BSD systems.  This is due to a flaw in HP-UX; it also affects the
+HP-UX
+.B du
+program.
diff --git a/install/binos2/makeos2/doc/gnufutil.os2 b/install/binos2/makeos2/doc/gnufutil.os2
new file mode 100644
index 00000000..8057b497
--- /dev/null
+++ b/install/binos2/makeos2/doc/gnufutil.os2
@@ -0,0 +1,117 @@
+This copy of the GNU file utilities for OS/2 has been compiled for OS/2
+using the emx 0.9b development tools. 
+
+An up to date copy should always be available as
+
+  ftp://ftp.leo.org/pub/comp/os/os2/gnu/systools/gnufutil.zip
+
+The programs were tested under OS/2 2.x with a HPFS, they support long
+filenames and extended attibutes (only cp, mv and install need to
+support EA's and thus do it, the other programs don't). The upper/lower
+case conversion in dd works correctly with national language characters.
+8-bit (such as NLS-) characters are displayed directly by ls, only
+nonprintable characters are replaced by ? or \-Sequences as usual.
+Support for \ and / as path separators was added where neccessary, i.e.
+in ls, cp, mv, rm, install, mkdir and rmdir. In dd there is support to
+access logical and physical drives by their drive name.
+
+a) The following programs of the GNU file utilities were ported to OS/2:
+
+chmod           supports DOS & OS/2 archive/hidden/system flags (partial,
+                flags can be changed, but changes are not reported by -v)
+cp              supports EA's
+dd              NLS support for conv=ucase/lcase, direct drive access support
+df              shows type instead of inode information
+du
+install         supports EA's
+ls/dir/vdir     shows DOS & OS/2 archive/hidden/system flags and 8-bit chars
+mkdir
+mv              supports EA's
+rm
+rmdir
+touch
+dircolors
+
+b) programs not ported:
+
+- chown, chgrp, ln, mkfifo and sync make no much sense under OS/2
+- mvdir is not needed, OS/2 has a rename() that can handle directories,
+  so mv already works for this purpose
+
+This version supports internationalization. To use it, set the
+LANGUAGE environment variable (for german messages, set it to "de").
+
+For that to work, you must set the LOCALEDIR environment variable to
+point to the base locale directory (default is /lib/locale). Into this
+directory, you must copy po/de.gmo (german message catalog, for
+example) from the distribution as de/LC_MESSAGES/@@@.mo and so
+on for other languages.
+
+Kai Uwe Rommel
+
+--
+/* Kai Uwe Rommel      ARS Computer & Consulting GmbH, Muenchen, Germany *
+ * rommel@ars.de             CompuServe 100265,2651, Fax +49 89 324 4524 *
+ * rommel@leo.org (ftp://ftp.leo.org/pub/comp/os/os2 maintenance)        */
+
+DOS ... is still a real mode only non-reentrant interrupt
+handler, and always will be.                -Russell Williams
+
+
+Version 2.1
+Thu 01-Aug-1991
+
+Adapted for version 3.1
+Sun 15-Sep-1991
+
+Adapted for version 3.2 (Actually ported over again from plain 
+sources because the old 16-bit port was screwed up too much.)
+now using emx/gcc (32-bit) under OS/2 2.0
+Sun 28-Jun-1992
+
+Bug fixes and enhancements.
+Wed 22-Jul-1992
+
+Adapted for version 3.3
+Wed 29-Jul-1992
+
+Changes for emx 0.8e, DLL version
+Thu 15-Oct-1992
+
+Version 3.4
+Sat 31-Oct-1992
+
+Version 3.6
+Sun 23-May-1993
+
+Bugfixes by Ric Andersson (traps in rm on many files with short names)
+and myself (rm -f warning on nonexisting *.o etc.)
+Sat 21-Aug-1993
+
+Version 3.12
+emx 0.9a
+Fri 16-Dec-1994
+
+Bugfix for direct disk access
+In dd, valid names are now A:, B:, C: ... for logical drives and
+$1:, $2: ... for physical fixed disks (be extremely careful!).
+Thu 16-Mar-1995
+
+Bugfix for "cp foo ." and "mv foo ." problems.
+Thu 30-Mar-1995
+
+Bugfix for "cp foo x:\" and "mv foo x:\" problems
+Sun 09-Apr-1995
+
+Bugfix for "mkdir -p" with path names with drive specification
+emx 0.9b
+Sat 20-Apr-1996
+
+Version 3.13
+Fri 02-Aug-1996
+
+Bugfix for touch and text mode error
+Bugfix for df on >4GB volumes
+Fixed ls mode flags output format
+Tue 31-Mar-1998
+
diff --git a/install/binos2/makeos2/doc/gnusutil.os2 b/install/binos2/makeos2/doc/gnusutil.os2
new file mode 100644
index 00000000..0b43a5e6
--- /dev/null
+++ b/install/binos2/makeos2/doc/gnusutil.os2
@@ -0,0 +1,60 @@
+GNU shell utilities for OS/2
+
+The programs were tested under OS/2 with HPFS, they support long
+filenames. They are mostly really simple under OS/2 (id, logname etc.)
+and perhaps most useful together with some shell under OS/2 to run
+real unmodified shell scripts.
+
+The following programs of the GNU shell utilities were ported to OS/2:
+
+basename
+date
+dirname
+env
+expr
+false
+id
+logname
+nice
+pathchk
+printenv
+printf
+sleep
+tee
+test
+true
+tty
+uname
+whoami
+yes
+
+And not ported:
+
+su
+who/users
+stty
+groups.sh (well, could be used, but why?)
+nohup.sh
+
+
+Kai Uwe Rommel
+rommel@ars.muc.de
+
+Version 1.3, MS C 6.00, OS/2 1.3
+Tue 29-Oct-1991
+
+Version 1.6, emx+gcc, OS/2 2.0
+Fri 21-Aug-1992
+
+Version 1.7, emx+gcc, OS/2 2.0
+Sun 20-Aug-1992
+Sat 12-Sep-1992, 0.8e, DLL version
+
+Version 1.8,
+Sat 31-Oct-1992
+
+Version 1.10,
+Mon 23-May-1994
+
+Vesion 1.12, emx 0.9a,
+Fri 16-Dec-1994
diff --git a/install/binos2/makeos2/doc/install.1 b/install/binos2/makeos2/doc/install.1
new file mode 100644
index 00000000..e2e05a84
--- /dev/null
+++ b/install/binos2/makeos2/doc/install.1
@@ -0,0 +1,78 @@
+.TH INSTALL 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+install \- copy files and set their attributes
+.SH SYNOPSIS
+.B install
+[options] [\-s] [\-\-strip] source dest
+.br
+.B install
+[options] [\-s] [\-\-strip] source... directory
+.br
+.B install
+[options] [\-d,\-\-directory] directory...
+.br
+Options:
+.br
+[\-c] [\-g group] [\-m mode] [\-o owner]
+[\-\-group=group] [\-\-mode=mode] [\-\-owner=owner]
+[\-\-help] [\-\-version]
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR install .
+.B install
+copies files and sets their permission modes and, if possible,
+their owner and group.  Used similarly to
+.BR cp ;
+typically used in Makefiles to copy programs into their destination
+directories.  It can also be used to create the destination
+directories and any leading directories, and to set the final
+directory's modes.  It refuses to copy files onto themselves.
+.SS OPTIONS
+.TP
+.I \-c
+Ignored; for compatibility with old Unix versions of install.
+.TP
+.I "\-d, \-\-directory"
+Create each given directory and its leading directories, if they do
+not already exist.  Set the owner, group and mode as given on the
+command line or to the defaults.  Also gives any leading directories
+that are created those attributes.  This is different from the SunOS
+4.x
+.IR install ,
+which gives directories that it creates the default attributes.
+.TP
+.I "\-g, \-\-group group"
+Set the group ownership of the installed file or directory to the
+group ID of
+.I group
+(default is process's current group).
+.I group
+may also be a numeric group ID.
+.TP
+.I "\-m, \-\-mode mode"
+Set the permission mode for the installed file or directory to
+.IR mode ,
+which can be either an octal number, or a symbolic mode as in chmod,
+with 0 as the point of departure.
+The default mode is 0755.
+.TP
+.I "\-o, \-\-owner owner"
+If run as root, set the ownership of the installed file to the user ID
+of
+.I owner
+(default is root).
+.I owner
+may also be a numeric user ID.
+.TP
+.I "\-s, \-\-strip"
+Strip the symbol tables from installed programs.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
diff --git a/install/binos2/makeos2/doc/ls.1 b/install/binos2/makeos2/doc/ls.1
new file mode 100644
index 00000000..5b67f806
--- /dev/null
+++ b/install/binos2/makeos2/doc/ls.1
@@ -0,0 +1,350 @@
+.TH LS 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+ls, dir, vdir \- list contents of directories
+.SH SYNOPSIS
+.B ls
+[\-abcdfgiklmnpqrstuxABCFGLNQRSUX1] [\-w cols] [\-T cols] [\-I pattern]
+[\-\-all] [\-\-escape] [\-\-directory] [\-\-inode] [\-\-kilobytes]
+[\-\-numeric-uid-gid] [--no-group] [\-\-hide-control-chars] [\-\-reverse]
+[\-\-size] [\-\-width=cols] [\-\-tabsize=cols] [\-\-almost-all]
+[\-\-ignore-backups] [\-\-classify] [\-\-file-type] [\-\-full-time]
+[\-\-ignore=pattern] [\-\-dereference] [\-\-literal] [\-\-quote-name]
+[\-\-recursive] [\-\-sort={none,time,size,extension}]
+[\-\-format={long,verbose,commas,across,vertical,single-column}]
+[\-\-time={atime,access,use,ctime,status}] [\-\-help] [\-\-version]
+[\-\-color[={yes,no,tty}]] [\-\-colour[={yes,no,tty}]] [name...]
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR ls .
+.B dir
+and
+.B vdir
+are versions of
+.B ls
+with different default output formats.
+These programs list each given file or directory name.  Directory contents are
+sorted alphabetically.  For
+.BR ls ,
+files are by default listed in columns, sorted
+vertically, if the standard output is a terminal; otherwise they are
+listed one per line.  For
+.BR dir ,
+files are by default listed in columns, sorted vertically.  For
+.BR vdir ,
+files are by default listed in long format.
+.SS OPTIONS
+.TP
+.I "\-a, \-\-all"
+List all files in directories, including all files that start with `.'.
+.TP
+.I "\-b, \-\-escape"
+Quote nongraphic characters in file names using alphabetic and octal
+backslash sequences like those used in C.
+.TP
+.I "\-c, \-\-time=ctime, \-\-time=status"
+Sort directory contents according to the files' status change time
+instead of the modification time.  If the long listing format is being
+used, print the status change time instead of the modification time.
+.TP
+.I "\-d, \-\-directory"
+List directories like other files, rather than listing their contents.
+.TP
+.I "\-f"
+Do not sort directory contents; list them in whatever order they are
+stored on the disk.
+The same as enabling
+.I \-a
+and
+.I \-U
+and disabling
+.I \-l,
+.I \-s,
+and
+.I \-t.
+.TP
+.I "\-\-full-time"
+List times in full, rather than using the standard abbreviation
+heuristics.
+.TP
+.I \-g
+Ignored; for Unix compatibility.
+.TP
+.I "\-i, \-\-inode"
+Print the index number of each file to the left of the file name.
+.TP
+.I "\-k, \-\-kilobytes"
+If file sizes are being listed, print them in kilobytes.  This
+overrides the environment variable POSIXLY_CORRECT.
+.TP
+.I "\-l, \-\-format=long, \-\-format=verbose"
+In addition to the name of each file, print the file type,
+permissions, number of hard links, owner name, group name, size in
+bytes, and timestamp (the modification time unless other times are
+selected).  For files with a time that is more than 6 months old or
+more than 1 hour into the future, the timestamp contains the year
+instead of the time of day.
+.TP
+.I "\-m, \-\-format=commas"
+List files horizontally, with as many as will fit on each line,
+separated by commas.
+.TP
+.I "\-n, \-\-numeric-uid-gid"
+List the numeric UID and GID instead of the names.
+.TP
+.I \-p
+Append a character to each file name indicating the file type.
+.TP
+.I "\-q, \-\-hide-control-chars"
+Print question marks instead of nongraphic characters in file names.
+.TP
+.I "\-r, \-\-reverse"
+Sort directory contents in reverse order.
+.TP
+.I "\-s, \-\-size"
+Print the size of each file in 1K blocks to the left of the file name.
+If the environment variable POSIXLY_CORRECT is set, 512-byte blocks
+are used instead.
+.TP
+.I "\-t, \-\-sort=time"
+Sort directory contents by timestamp instead of alphabetically, with
+the newest files listed first.
+.TP
+.I "\-u, \-\-time=atime, \-\-time=access, \-\-time=use"
+Sort directory contents according to the files' last access time
+instead of the modification time.  If the long listing format is being
+used, print the last access time instead of the modification time.
+.TP
+.I "\-x, \-\-format=across, \-\-format=horizontal"
+List the files in columns, sorted horizontally.
+.TP
+.I "\-A, \-\-almost-all"
+List all files in directories, except for `.' and `..'.
+.TP
+.I "\-B, \-\-ignore-backups"
+Do not list files that end with `~', unless they are given on the
+command line.
+.TP
+.I "\-C, \-\-format=vertical"
+List files in columns, sorted vertically.
+.TP
+.I "\-F, \-\-classify"
+Append a character to each file name indicating the file type.  For
+regular files that are executable, append a `*'.  The file type
+indicators are `/' for directories, `@' for symbolic links, `|' for
+FIFOs, `=' for sockets, and nothing for regular files.
+.TP
+.I "\-G, \-\-no\-group"
+Inhibit display of group information in a long format directory listing.
+.TP
+.I "\-L, \-\-dereference"
+List the files linked to by symbolic links instead of listing the
+contents of the links.
+.TP
+.I "\-N, \-\-literal"
+Do not quote file names.
+.TP
+.I "\-Q, \-\-quote-name"
+Enclose file names in double quotes and quote nongraphic characters as
+in C.
+.TP
+.I "\-R, \-\-recursive"
+List the contents of all directories recursively.
+.TP
+.I "\-S, \-\-sort=size"
+Sort directory contents by file size instead of alphabetically, with
+the largest files listed first.
+.TP
+.I "\-U, \-\-sort=none"
+Do not sort directory contents; list them in whatever order they are
+stored on the disk.  This option is not called
+.I \-f
+because the Unix
+.B ls
+.I \-f
+option also enables
+.I \-a
+and disables
+.IR \-l ,
+.IR \-s ,
+and
+.IR \-t .
+It seems useless and ugly to group those unrelated things together in
+one option.  Since this option doesn't do that, it has a different
+name.
+.TP
+.I "\-X, \-\-sort=extension"
+Sort directory contents alphabetically by file extension (characters
+after the last `.'); files with no extension are sorted first.
+.TP
+.I "\-1, \-\-format=single-column"
+List one file per line.
+.TP
+.I "\-w, \-\-width cols"
+Assume the screen is
+.I cols
+columns wide.  The default is taken from the terminal driver if
+possible; otherwise the environment variable
+.B COLUMNS
+is used if it is set; otherwise the default is 80.
+.TP
+.I "\-T, \-\-tabsize cols"
+Assume that each tabstop is
+.I cols
+columns wide.  The default is 8.
+.TP
+.I "\-I, \-\-ignore pattern"
+Do not list files whose names match the shell pattern
+.I pattern
+unless they are given on the command line.  As in the shell, an
+initial `.' in a filename does not match a wildcard at the start of
+.I pattern.
+.TP
+.I "\-\-color, \-\-colour, \-\-color=yes, \-\-colour=yes"
+Colorize the names of files depending on the type of file.
+See
+.B DISPLAY COLORIZATION
+below.
+.TP
+.I "\-\-color=tty, \-\-colour=tty"
+Same as
+.I \-\-color
+but only if standard output is a terminal.  This is very useful for
+shell scripts and command aliases, especially if your favorite pager
+does not support color control codes.
+.TP
+.I "\-\-color=no, \-\-colour=no"
+Disables colorization.  This is the default.  Provided to override a
+previous color option.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
+.SS DISPLAY COLORIZATION
+When using the
+.I "\-\-color"
+option, this version of
+.B ls
+will colorize the file names printed according to the name and type of
+file.  By default, this colorization is by type only, and the codes
+used are ISO 6429 (ANSI) compliant.
+.PP
+You can override the default colors by defining the environment
+variable
+.B LS_COLORS
+(or
+.BR LS_COLOURS ).
+The format of this variable is reminicent of the termcap(5) file
+format; a colon-separated list of expressions of the form "xx=string",
+where "xx" is a two-character variable name.  The variables with their
+associated defaults are:
+.sp
+.RS +.2i
+.ta 1.0i 2.5i
+.nf
+\fBno\fR       0       Normal (non-filename) text
+\fBfi\fR       0       Regular file
+\fBdi\fR       32      Directory
+\fBln\fR       36      Symbolic link
+\fBpi\fR       31      Named pipe (FIFO)
+\fBso\fR       33      Socket
+\fBbd\fR       44;37   Block device
+\fBcd\fR       44;37   Character device
+\fBex\fR       35      Executable file
+\fBmi\fR       (none)  Missing file (defaults to fi)
+\fBor\fR       (none)  Orphanned symbolic link (defaults to ln)
+\fBlc\fR       \ee[    Left code
+\fBrc\fR       m       Right code
+\fBec\fR       (none)  End code (replaces lc+no+rc)
+.fi
+.RE
+.sp
+You only need to include the variables you want to change from the
+default.
+.PP
+File names can also be colorized based on filename extension.  This is
+specified in the LS_COLORS variable using the syntax "*ext=string".
+For example, using ISO 6429 codes, to color all C-language source
+files blue you would specify "*.c=34".  This would color all files
+ending in .c in blue (34) color.
+.PP
+Control characters can be written either in C-style \e-escaped
+notation, or in
+.BR stty -like
+^-notation.  The C-style notation adds \ee for Escape, \e_ for a
+normal space characer, and \e? for Delete.  In addition, the \e escape
+character can be used to override the default interpretation of \e, ^,
+: and =.
+.PP
+Each file will be written as <lc> <color\ code> <rc> <filename> <ec>.
+If the <ec> code is undefined, the sequence <lc> <no> <rc> will be
+used instead.  This is generally more convenient to use, but less
+general.  The left, right and end codes are provided so you don't have
+to type common parts over and over again and to support weird
+terminals; you will generally not need to change them at all unless
+your terminal does not use ISO 6429 color sequences but a different
+system.
+.PP
+If your terminal does use ISO 6429 color codes, you can compose the type
+codes (i.e. all except the
+.BR lc ,
+.BR rc ,
+and
+.B ec
+codes) from numerical commands separated by semicolons.  The most
+common commands are:
+.sp
+.RS +.2i
+.ta 1.0i
+.nf
+ 0     to restore default color
+ 1     for brighter colors
+ 4     for underlined text
+ 5     for flashing text
+30     for black foreground
+31     for red foreground
+32     for green foreground
+33     for yellow (or brown) foreground
+34     for blue foreground
+35     for purple foreground
+36     for cyan foreground
+37     for white (or gray) foreground
+40     for black background
+41     for red background
+42     for green background
+43     for yellow (or brown) background
+44     for blue background
+45     for purple background
+46     for cyan background
+47     for white (or gray) background
+.fi
+.RE
+.sp
+Not all commands will work on all systems or display devices.
+.PP
+A few terminal programs do not recognize the default end code
+properly.  If all text gets colorized after you do a directory
+listing, try changing the
+.B no
+and
+.B fi
+codes from 0 to the numerical codes for your standard fore- and
+background colors.
+.SH BUGS
+On BSD systems, the
+.I \-s
+option reports sizes that are half the correct values for files that
+are NFS-mounted from HP-UX systems.  On HP-UX systems, it reports
+sizes that are twice the correct values for files that are NFS-mounted
+from BSD systems.  This is due to a flaw in HP-UX; it also affects the
+HP-UX
+.B ls
+program.
+.PP
+If there was a single standard for the English language it would not
+be necessary to support redundant spellings.
diff --git a/install/binos2/makeos2/doc/make.emx b/install/binos2/makeos2/doc/make.emx
new file mode 100644
index 00000000..6f45d236
--- /dev/null
+++ b/install/binos2/makeos2/doc/make.emx
@@ -0,0 +1,91 @@
+This is the EMX OS/2 port of GNU make. It was initially done by 
+Kent Williams <williams@herky.cs.uiowa.edu>. It has later been taken
+over by Kai Uwe Rommel <rommel@ars.de>. It can be used with EMX
+for OS/2 and Win32 (RSX). 
+
+The Win32 flavor of this EMX port does not rely on the native Win32
+patches that were integrated by Cygnus. They do also support a Win32
+version, but that port seems to be very incomplete, according to their
+own docs.
+
+This version of GNU make supports embedded REXX commands under OS/2.
+Similar like Unix users can embed shell commands into command lists of
+rules, OS/2 users can use REXX for this purpose. The major difference
+is that the Unix version executes an external shell with the shell
+commands passed as arguments while the OS/2 version executes REXX
+commands internally, by passing them directly to the resident OS/2
+REXX interpreter, without need for subprocesses. This should thus be
+faster.
+
+Compared to REXX commands written as external .CMD procedures, the
+following restrictions apply, however:
+
+- any REXX command in a rule's command list must be prefixed by the
+  keyword "rexx"
+- all REXX commands can be only one line long, similarly to the
+  restrictions for shell commands in Makefiles under Unix, but:
+- similar like the Unix implementation does with embedded shell
+  commands, GNU make allows you to let a REXX command (script) span
+  multiple lines if you use the backslash as "continuation" character
+  at the end of each line and also use the semicolon to end each REXX
+  command line, since they will be concatenated into one single line
+- GNU make uses quoting characters (\, " and ') internally, so if you
+  need to use them in REXX commands, you have to quote them properly,
+  just like you have to if you embed shell commands in Unix Makefiles
+- a REXX command script may end with a "return" or "exit" statement
+  with a numeric parameter which is interpreted by make like the exit
+  code of an external command, if no such statement is used, the exit
+  code is assumed to be zero (i.e. no error)
+- this is a quick hack and may have bugs, let me know if you find any
+
+Example:
+
+test:
+        rexx do i=1 to 10; say i; end; return 0
+
+which could also be written as
+
+test:
+        rexx \
+	  do i=1 to 10; \
+	    say i; \
+	  end; \
+	  return 0
+
+If a REXX script parses "source", then the third parameter will
+contain the word "MAKE" instead of the .CMD file's pathname that
+external REXX procedures get in this place.
+
+History:
+93/08/08: update to 3.68, fixed handling of " and ' quotes.
+93/11/23: preliminary update to 3.69, none of the pending fixes done yet.
+94/02/18: cleanup of quoting and shell problems, update to version 3.70
+94/03/14: fixes for still outstanding and newly introduced bugs
+94/04/24: fix for drive letters in targets and backslashes in command
+          lines, should run under DOS too now
+94/06/07: update to 3.71, fix for bug with trailing backslashes
+94/08/03: fixes for /c and for drive letters
+94/12/13: update for 3.72
+95/04/20: update for 3.73, needed major changes in job.c
+95/04/24: fix for ` characters in command lines
+95/06/12: update for 3.74
+96/05/19: fixes for crashes, case insensitivity, tab/spaces, added REXX support
+96/06/16: fixes for quoting bug and rexx incompatibility with other shells,
+          removed tab/spaces fix because it causes other problems
+96/09/15: update for 3.75
+96/09/21: fixed VPATH handling (for \ instead of /)
+96/10/20: added fix or hanging on Ctrl-C, by Eberhard Mattes
+96/12/28: fixed endless recursion for some kinds of quoting,
+          added Win32 support
+97/04/01: fixed VPATH separator bug
+98/04/20: update for 3.76.1 (with help from Sharon Dagan, <sdagan@ibm.net>)
+98/04/24: fixed various bugs (perhaps)
+          added PATH_SEPARATOR_CHAR environment variable for VPATH override
+
+--
+/* Kai Uwe Rommel                   ARS Computer & Consulting GmbH *
+ * rommel@ars.de (http://www.ars.de)             Muenchen, Germany *
+ * rommel@leo.org (http://www.leo.org/pub/comp/os/os2 maintenance) */
+
+DOS ... is still a real mode only non-reentrant interrupt
+handler, and always will be.                -Russell Williams
diff --git a/install/binos2/makeos2/doc/make.man b/install/binos2/makeos2/doc/make.man
new file mode 100644
index 00000000..1bd37a7e
--- /dev/null
+++ b/install/binos2/makeos2/doc/make.man
@@ -0,0 +1,302 @@
+.TH MAKE 1L "22 August 1989" "GNU" "LOCAL USER COMMANDS"
+.SH NAME
+make \- GNU make utility to maintain groups of programs
+.SH SYNOPSIS
+.B "make "
+[
+.B \-f
+makefile ] [ option ] ...
+target ...
+.SH WARNING
+This man page is an extract of the documentation of
+.I GNU make .
+It is updated only occasionally, because the GNU project does not use nroff.
+For complete, current documentation, refer to the Info file
+.B make
+or the DVI file
+.B make.dvi
+which are made from the Texinfo source file
+.BR make.texinfo .
+.SH DESCRIPTION
+.LP
+The purpose of the
+.I make
+utility is to determine automatically which
+pieces of a large program need to be recompiled, and issue the commands to
+recompile them.
+This manual describes the GNU implementation of
+.IR make ,
+which was written by Richard Stallman and Roland McGrath.
+Our examples show C programs, since they are most common, but you can use
+.I make
+with any programming language whose compiler can be run with a
+shell command.
+In fact,
+.I make
+is not limited to programs.
+You can use it to describe any task where some files must be
+updated automatically from others whenever the others change.
+.LP
+To prepare to use
+.IR make ,
+you must write a file called the
+.I makefile
+that describes the relationships among files in your program, and the
+states the commands for updating each file.
+In a program, typically the executable file is updated from object
+files, which are in turn made by compiling source files.
+.LP
+Once a suitable makefile exists, each time you change some source files,
+this simple shell command:
+.sp 1
+.RS
+.B make
+.RE
+.sp 1
+suffices to perform all necessary recompilations.
+The
+.I make
+program uses the makefile data base and the last-modification times
+of the files to decide which of the files need to be updated.
+For each of those files, it issues the commands recorded in the data base.
+.LP
+.I make
+executes commands in the
+.I makefile
+to update
+one or more target
+.IR names ,
+where
+.I name
+is typically a program.
+If no
+.B \-f
+option is present,
+.I make
+will look for the makefiles
+.IR GNUmakefile ,
+.IR makefile ,
+and
+.IR Makefile ,
+in that order.
+.LP
+Normally you should call your makefile either
+.I makefile
+or
+.IR Makefile .
+(We recommend
+.I Makefile
+because it appears prominently near the beginning of a directory
+listing, right near other important files such as
+.IR  README .)
+The first name checked,
+.IR GNUmakefile ,
+is not recommended for most makefiles.
+You should use this name if you have a makefile that is specific to GNU
+.IR make ,
+and will not be understood by other versions of
+.IR make .
+If
+.I makefile
+is `\-', the standard input is read.
+.LP
+.I make
+updates a target if it depends on prerequisite files
+that have been modified since the target was last modified,
+or if the target does not exist.
+.SH OPTIONS
+.sp 1
+.TP 0.5i
+.B \-b
+.TP 0.5i
+.B \-m
+These options are ignored for compatibility with other versions of
+.IR make .
+.TP 0.5i
+.BI "\-C " dir
+Change to directory
+.I dir
+before reading the makefiles or doing anything else.
+If multiple
+.B \-C
+options are specified, each is interpreted relative to the
+previous one:
+.BR "\-C " /
+.BR "\-C " etc
+is equivalent to
+.BR "\-C " /etc.
+This is typically used with recursive invocations of
+.IR make .
+.TP 0.5i
+.B \-d
+Print debugging information in addition to normal processing.
+The debugging information says which files are being considered for
+remaking, which file-times are being compared and with what results,
+which files actually need to be remade, which implicit rules are
+considered and which are applied---everything interesting about how
+.I make
+decides what to do.
+.TP 0.5i
+.B \-e
+Give variables taken from the environment precedence
+over variables from makefiles.
+.TP 0.5i
+.BI "\-f " file
+Use
+.I file
+as a makefile.
+.TP 0.5i
+.B \-i
+Ignore all errors in commands executed to remake files.
+.TP 0.5i
+.BI "\-I " dir
+Specifies a directory
+.I dir
+to search for included makefiles.
+If several
+.B \-I
+options are used to specify several directories, the directories are
+searched in the order specified.
+Unlike the arguments to other flags of
+.IR make ,
+directories given with
+.B \-I
+flags may come directly after the flag:
+.BI \-I dir
+is allowed, as well as
+.BI "\-I " dir.
+This syntax is allowed for compatibility with the C
+preprocessor's
+.B \-I
+flag.
+.TP 0.5i
+.BI "\-j " jobs
+Specifies the number of jobs (commands) to run simultaneously.
+If there is more than one
+.B \-j
+option, the last one is effective.
+If the
+.B \-j
+option is given without an argument,
+.IR make
+will not limit the number of jobs that can run simultaneously.
+.TP 0.5i
+.B \-k
+Continue as much as possible after an error.
+While the target that failed, and those that depend on it, cannot
+be remade, the other dependencies of these targets can be processed
+all the same.
+.TP 0.5i
+.B \-l
+.TP 0.5i
+.BI "\-l " load
+Specifies that no new jobs (commands) should be started if there are
+others jobs running and the load average is at least
+.I load
+(a floating-point number).
+With no argument, removes a previous load limit.
+.TP 0.5i
+.B \-n
+Print the commands that would be executed, but do not execute them.
+.TP 0.5i
+.BI "\-o " file
+Do not remake the file
+.I file
+even if it is older than its dependencies, and do not remake anything
+on account of changes in
+.IR file .
+Essentially the file is treated as very old and its rules are ignored.
+.TP 0.5i
+.B \-p
+Print the data base (rules and variable values) that results from
+reading the makefiles; then execute as usual or as otherwise
+specified.
+This also prints the version information given by the
+.B \-v
+switch (see below).
+To print the data base without trying to remake any files, use
+.B make
+.B \-p
+.BI \-f /dev/null.
+.TP 0.5i
+.B \-q
+``Question mode''.
+Do not run any commands, or print anything; just return an exit status
+that is zero if the specified targets are already up to date, nonzero
+otherwise.
+.TP 0.5i
+.B \-r
+Eliminate use of the built-in implicit rules.
+Also clear out the default list of suffixes for suffix rules.
+.TP 0.5i
+.B \-s
+Silent operation; do not print the commands as they are executed.
+.TP 0.5i
+.B \-S
+Cancel the effect of the
+.B \-k
+option.
+This is never necessary except in a recursive
+.I make
+where
+.B \-k
+might be inherited from the top-level
+.I make
+via MAKEFLAGS or if you set
+.B \-k
+in MAKEFLAGS in your environment.
+.TP 0.5i
+.B \-t
+Touch files (mark them up to date without really changing them)
+instead of running their commands.
+This is used to pretend that the commands were done, in order to fool
+future invocations of
+.IR make .
+.TP 0.5i
+.B \-v
+Print the version of the
+.I make
+program plus a copyright, a list of authors and a notice that there
+is no warranty.
+After this information is printed, processing continues normally.
+To get this information without doing anything else, use
+.B make
+.B \-v
+.BI \-f /dev/null.
+.TP 0.5i
+.B \-w
+Print a message containing the working directory
+before and after other processing.
+This may be useful for tracking down errors from complicated nests of
+recursive
+.I make
+commands.
+.TP 0.5i
+.BI "\-W " file
+Pretend that the target
+.I file
+has just been modified.
+When used with the
+.B \-n
+flag, this shows you what would happen if you were to modify that file.
+Without
+.BR \-n ,
+it is almost the same as running a
+.I touch
+command on the given file before running
+.IR make ,
+except that the modification time is changed only in the imagination of
+.IR make .
+.SH "SEE ALSO"
+.PD 0
+.TP 2.0i
+/usr/local/doc/gnumake.dvi
+.I
+The GNU Make Manual
+.PD
+.SH BUGS
+See the chapter `Problems and Bugs' in
+.I "The GNU Make Manual" .
+.SH AUTHOR
+This manual page contributed by Dennis Morse of Stanford University.
+It has been reworked by Roland McGrath.
diff --git a/install/binos2/makeos2/doc/mkdir.1 b/install/binos2/makeos2/doc/mkdir.1
new file mode 100644
index 00000000..67f62784
--- /dev/null
+++ b/install/binos2/makeos2/doc/mkdir.1
@@ -0,0 +1,35 @@
+.TH MKDIR 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+mkdir \- make directories
+.SH SYNOPSIS
+.B mkdir
+[\-p] [\-m mode] [\-\-parents] [\-\-mode=mode] [\-\-help] [\-\-version] dir...
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR mkdir .
+.B mkdir
+creates a directory with each given name.  By default, the mode of
+created directories is 0777 minus the bits set in the umask.
+.SS OPTIONS
+.TP
+.I "\-m, \-\-mode mode"
+Set the mode of created directories to
+.IR mode ,
+which is symbolic as in chmod and uses the default mode as the point of
+departure.
+.TP
+.I "\-p, \-\-parents"
+Ensure that each given directory exists.  Create any missing parent
+directories for each argument.  Parent directories default to the
+umask modified by `u+wx'.  Do not consider an argument directory that
+already exists to be an error.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
diff --git a/install/binos2/makeos2/doc/mv.1 b/install/binos2/makeos2/doc/mv.1
new file mode 100644
index 00000000..7a4847f4
--- /dev/null
+++ b/install/binos2/makeos2/doc/mv.1
@@ -0,0 +1,92 @@
+.TH MV 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+mv \- rename files
+.SH SYNOPSIS
+.B mv
+[options] source dest
+.br
+.B mv
+[options] source... directory
+.br
+Options:
+.br
+[\-bfiuv] [\-S backup-suffix] [\-V {numbered,existing,simple}]
+[\-\-backup] [\-\-force] [\-\-interactive] [\-\-update] [\-\-verbose]
+[\-\-suffix=backup-suffix] [\-\-version-control={numbered,existing,simple}]
+[\-\-help] [\-\-version]
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR mv .
+If the last argument names an existing directory,
+.B mv
+moves each other
+given file into a file with the same name in that directory.
+Otherwise, if only two files are given, it moves the first onto the
+second.  It is an error if the last argument is not a directory and
+more than two files are given.  It can move only regular files across
+filesystems.
+.P
+If a destination file is unwritable, the standard input is a tty, and
+the \fI\-f\fR or \fI\-\-force\fR option is not given,
+.B mv
+prompts the user for whether to overwrite the file.  If the response
+does not begin with `y' or `Y', the file is skipped.
+.SS OPTIONS
+.TP
+.I "\-b, \-\-backup"
+Make backups of files that are about to be removed.
+.TP
+.I "\-f, \-\-force"
+Remove existing destination files and never prompt the user.
+.TP
+.I "\-i, \-\-interactive"
+Prompt whether to overwrite each destination file that already
+exists.  If the response does not begin with `y' or `Y', the file is
+skipped.
+.TP
+.I "\-u, \-\-update"
+Do not move a nondirectory that has an existing destination with the
+same or newer modification time.
+.TP
+.I "\-v, \-\-verbose"
+Print the name of each file before moving it.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
+.TP
+.I "\-S, \-\-suffix backup-suffix"
+The suffix used for making simple backup files can be set with the
+.B SIMPLE_BACKUP_SUFFIX
+environment variable, which can be overridden by this option.  If
+neither of those is given, the default is `~', as it is in Emacs.
+.TP
+.I "\-V, \-\-version-control {numbered,existing,simple}"
+The type of backups made can be set with the
+.B VERSION_CONTROL
+environment variable, which can be overridden by this option.  If
+.B VERSION_CONTROL
+is not set and this option is not given, the default backup type is
+`existing'.  The value of the
+.B VERSION_CONTROL
+environment variable and the argument to this option are like the GNU
+Emacs `version-control' variable; they also recognize synonyms that
+are more descriptive.  The valid values are (unique abbreviations are
+accepted):
+.RS
+.TP
+`t' or `numbered'
+Always make numbered backups.
+.TP
+`nil' or `existing'
+Make numbered backups of files that already
+have them, simple backups of the others.
+.TP
+`never' or `simple'
+Always make simple backups.
diff --git a/install/binos2/makeos2/doc/pwd.1 b/install/binos2/makeos2/doc/pwd.1
new file mode 100644
index 00000000..0a78453a
--- /dev/null
+++ b/install/binos2/makeos2/doc/pwd.1
@@ -0,0 +1,29 @@
+.TH PWD 1L "GNU Shell Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+pwd \- print name of current/working directory
+.SH SYNOPSIS
+.B pwd
+.br
+.B pwd
+{\-\-help,\-\-version}
+.SH DESCRIPTION
+This manual page
+documents the GNU version of
+.BR pwd .
+.B pwd
+prints the fully resolved name of the current directory.
+That is, all components of the printed name will be actual
+directory names \-\- none will be symbolic links.
+.PP
+Note that most Unix shells provide a built-in
+.B pwd
+command with similar functionality so the unadorned, interactive
+.B pwd
+command will usually execute the built-in version and not this one.
+.SS OPTIONS
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
diff --git a/install/binos2/makeos2/doc/rm.1 b/install/binos2/makeos2/doc/rm.1
new file mode 100644
index 00000000..bff877b2
--- /dev/null
+++ b/install/binos2/makeos2/doc/rm.1
@@ -0,0 +1,71 @@
+.TH RM 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+rm \- remove files
+.SH SYNOPSIS
+.B rm
+[\-dfirvR] [\-\-directory] [\-\-force] [\-\-interactive] [\-\-recursive]
+[\-\-help] [\-\-version] [\-\-verbose] name...
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR rm .
+.B rm
+removes each specified file.  By default, it does not remove
+directories.
+.P
+If a file is unwritable, the standard input is a tty, and
+the \fI\-f\fR or \fI\-\-force\fR option is not given,
+.B rm
+prompts the user for whether to remove the file.  If the response
+does not begin with `y' or `Y', the file is skipped.
+.LP
+GNU
+.BR rm ,
+like every program that uses the getopt function to parse its
+arguments, lets you use the
+.I \-\-
+option to indicate that all following arguments are non-options.  To
+remove a file called `\-f' in the current directory, you could type
+either
+.RS
+rm \-\- \-f
+.RE
+or
+.RS
+rm ./\-f
+.RE
+The Unix
+.B rm
+program's use of a single `\-' for this purpose predates the
+development of the getopt standard syntax.
+.SS OPTIONS
+.TP
+.I "\-d, \-\-directory"
+Remove directories with `unlink' instead of `rmdir', and don't require
+a directory to be empty before trying to unlink it.  Only works for
+the super-user.  Because unlinking a directory causes any files in the
+deleted directory to become unreferenced, it is wise to
+.B fsck
+the filesystem after doing this.
+.TP
+.I "\-f, \-\-force"
+Ignore nonexistent files and never prompt the user.
+.TP
+.I "\-i, \-\-interactive"
+Prompt whether to remove each file.  If the response does not begin
+with `y' or `Y', the file is skipped.
+.TP
+.I "\-r, \-R, \-\-recursive"
+Remove the contents of directories recursively.
+.TP
+.I "\-v, \-\-verbose"
+Print the name of each file before removing it.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
diff --git a/install/binos2/makeos2/doc/rmdir.1 b/install/binos2/makeos2/doc/rmdir.1
new file mode 100644
index 00000000..bd11ef55
--- /dev/null
+++ b/install/binos2/makeos2/doc/rmdir.1
@@ -0,0 +1,27 @@
+.TH RMDIR 1 "GNU File Utilities" "FSF" \" -*- nroff -*-
+.SH NAME
+rmdir \- remove empty directories
+.SH SYNOPSIS
+.B rmdir
+[\-p] [\-\-parents] [\-\-help] [\-\-version] dir...
+.SH DESCRIPTION
+This documentation is no longer being maintained and may be inaccurate
+or incomplete.  The Texinfo documentation is now the authoritative source.
+.PP
+This manual page
+documents the GNU version of
+.BR rmdir .
+.B rmdir
+removes each given empty directory.  If any non-option argument
+does not refer to an existing empty directory, it is an error.
+.SS OPTIONS
+.TP
+.I "\-p, \-\-parents"
+Remove any parent directories that are explicitly mentioned in an
+argument, if they become empty after the argument file is removed.
+.TP
+.I "\-\-help"
+Print a usage message on standard output and exit successfully.
+.TP
+.I "\-\-version"
+Print version information on standard output then exit successfully.
diff --git a/install/binw32/ar.exe b/install/binw32/ar.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/as.exe b/install/binw32/as.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/cmp.exe b/install/binw32/cmp.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/cp.exe b/install/binw32/cp.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/cpp.exe b/install/binw32/cpp.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/diff.exe b/install/binw32/diff.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/dlltool.exe b/install/binw32/dlltool.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/gcc.exe b/install/binw32/gcc.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/gdate.exe b/install/binw32/gdate.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/gdb.exe b/install/binw32/gdb.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/gecho.exe b/install/binw32/gecho.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/ginstall.exe b/install/binw32/ginstall.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/gmkdir.exe b/install/binw32/gmkdir.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/grep.exe b/install/binw32/grep.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/ld.exe b/install/binw32/ld.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/make.exe b/install/binw32/make.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/mv.exe b/install/binw32/mv.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/nm.exe b/install/binw32/nm.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/objcopy.exe b/install/binw32/objcopy.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/objdump.exe b/install/binw32/objdump.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/patch.exe b/install/binw32/patch.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/pwd.exe b/install/binw32/pwd.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/rm.exe b/install/binw32/rm.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/strip.exe b/install/binw32/strip.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/unzip.exe b/install/binw32/unzip.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/windres.exe b/install/binw32/windres.exe
old mode 100644
new mode 100755
diff --git a/install/binw32/zip.exe b/install/binw32/zip.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/cmp.exe b/install/binw64/cmp.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/cp.exe b/install/binw64/cp.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/diff.exe b/install/binw64/diff.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/gdate.exe b/install/binw64/gdate.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/gecho.exe b/install/binw64/gecho.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/ginstall.exe b/install/binw64/ginstall.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/gmkdir.exe b/install/binw64/gmkdir.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/make.exe b/install/binw64/make.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/mv.exe b/install/binw64/mv.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/pwd.exe b/install/binw64/pwd.exe
old mode 100644
new mode 100755
diff --git a/install/binw64/rm.exe b/install/binw64/rm.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinmsdos/nasm.exe b/install/crossbinmsdos/nasm.exe
old mode 100644
new mode 100755
index 2ecdc4f9..d487bd82
Binary files a/install/crossbinmsdos/nasm.exe and b/install/crossbinmsdos/nasm.exe differ
diff --git a/install/crossbinw64/x86_64-win64-ar.exe b/install/crossbinw64/x86_64-win64-ar.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinw64/x86_64-win64-as.exe b/install/crossbinw64/x86_64-win64-as.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinw64/x86_64-win64-ld.exe b/install/crossbinw64/x86_64-win64-ld.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinw64/x86_64-win64-nm.exe b/install/crossbinw64/x86_64-win64-nm.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinw64/x86_64-win64-objcopy.exe b/install/crossbinw64/x86_64-win64-objcopy.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinw64/x86_64-win64-objdump.exe b/install/crossbinw64/x86_64-win64-objdump.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinw64/x86_64-win64-strip.exe b/install/crossbinw64/x86_64-win64-strip.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinw64/x86_64-win64-windres.exe b/install/crossbinw64/x86_64-win64-windres.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-ar.exe b/install/crossbinwce/arm-wince-ar.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-as.exe b/install/crossbinwce/arm-wince-as.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-dlltool.exe b/install/crossbinwce/arm-wince-dlltool.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-gdb.exe b/install/crossbinwce/arm-wince-gdb.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-ld.exe b/install/crossbinwce/arm-wince-ld.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-nm.exe b/install/crossbinwce/arm-wince-nm.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-objcopy.exe b/install/crossbinwce/arm-wince-objcopy.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-objdump.exe b/install/crossbinwce/arm-wince-objdump.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-pe-stub.exe b/install/crossbinwce/arm-wince-pe-stub.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-strip.exe b/install/crossbinwce/arm-wince-strip.exe
old mode 100644
new mode 100755
diff --git a/install/crossbinwce/arm-wince-windres.exe b/install/crossbinwce/arm-wince-windres.exe
old mode 100644
new mode 100755
diff --git a/install/darwin/macos/CommandLineToolsCheck b/install/darwin/macos/CommandLineToolsCheck
new file mode 100755
index 00000000..f2d89d15
--- /dev/null
+++ b/install/darwin/macos/CommandLineToolsCheck
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# based on https://github.com/Homebrew/install/blob/master/install.sh
+
+major_minor() {
+  echo "${1%%.*}.$(x="${1#*.}"; echo "${x%%.*}")"
+}
+
+if [[ -z "${HOMEBREW_ON_LINUX-}" ]]; then
+  macos_version="$(major_minor "$(/usr/bin/sw_vers -productVersion)")"
+fi
+
+version_gt() {
+  [[ "${1%.*}" -gt "${2%.*}" ]] || [[ "${1%.*}" -eq "${2%.*}" && "${1#*.}" -gt "${2#*.}" ]]
+}
+
+should_install_command_line_tools() {
+  if version_gt "$macos_version" "10.13"; then
+    ! [[ -e "/Library/Developer/CommandLineTools/usr/bin/git" ]]
+  else
+    ! [[ -e "/usr/lib/crt1.o" ]]
+  fi
+}
+
+if should_install_command_line_tools; then
+  exit 1
+else
+  exit 0
+fi
diff --git a/install/darwin/macos/fpc-intel-macosx/ReadMe.txt b/install/darwin/macos/fpc-intel-macosx/ReadMe.txt
new file mode 100644
index 00000000..ec845e22
--- /dev/null
+++ b/install/darwin/macos/fpc-intel-macosx/ReadMe.txt
@@ -0,0 +1,265 @@
+
+                            Free Pascal Compiler
+
+                               Version 3.2.2
+
+****************************************************************************
+* Introduction
+****************************************************************************
+
+Please also read the platform specific README file, if it exists.
+
+This package contains an advanced freeware 32-bit/64-bit/16-bit pascal compiler for several platforms. The language and the runtime library are almost compatible with Turbo Pascal 7.0 and recent Delphi releases. There is also partial support for the Macintosh pascal dialect.
+
+News and changes related to this release are described in whatsnew.txt.
+
+Free Pascal 3.2.2 is currently available for the following platforms:
+- Linux-i386
+- Linux-x86_64 (amd64)
+- Linux-powerpc
+- Linux-sparc
+- Linux-ARM
+- Win32-i386 (2000/XP, WinNT or later)
+- Win64-x86_64 (XP or later)
+- Wince-ARM (cross compiled from win32-i386)
+- FreeBSD-i386
+- FreeBSD-x86_64
+- Mac OS X/Darwin for PowerPC (32 and 64 bit)
+- Mac OS X/Darwin for Intel (32 and 64 bit)
+- Mac OS X/Darwin for AArch64/ARM64
+- iOS (ARM and AArch64/ARM64) and iPhoneSimulator (32 and 64 bit)
+- OS/2-i386 (OS/2 Warp v3.0, 4.0, WarpServer for e-Business and eComStation)
+- Haiku-i386
+- GO32v2-i386
+- Nintendo Gameboy Advance-ARM (cross compile from win32-i386)
+- Nintendo DS-ARM (cross compile from win32-i386)
+- Nintendo Wii-powerpc (cross compile from win32-i386)
+- AIX 5.3 and later for PowerPC (32 and 64 bit)
+- Java JVM (1.5 and later) and Android Dalvik (Android 4.0 and later)
+- Android (AArch64, x86_64, ARM, i386, MIPS) via cross-compiling.
+- MSDos-i8086 (cross compiled from win32-i386 or Linux) 
+- Amiga, MorphOS and AROS
+
+There are other platforms (like other BSD variants) which are more or less working, but there is currently no maintainer for them and thus we cannot provide adequate support. If you want to change this and create and maintain versions for other platforms and targets, feel free to contact us, e-mail addresses are listed below.
+
+
+****************************************************************************
+* Features
+****************************************************************************
+
+- high speed compiler
+- fully 16, 32 or 64-bit code
+  - 32 bit compiler can be used on x86_64 Linux distributions to compile 32 bit applications
+- language features:
+  - almost fully compatible with Borland Pascal and Borland Delphi
+  - ansi strings
+  - wide strings
+  - exception support
+  - RTTI support
+  - procedure overloading
+  - generics
+  - operator overloading
+  - COM, CORBA and raw interfaces support
+  - dynamic array support
+  - variant support
+  - inlining
+- code optimizer:
+  - peephole optimizer (80x86 only)
+  - jump optimizer
+  - loading of variables into registers
+  - assembler level dataflow analyzer (80x86 only)
+  - stack frame eliminations
+  - sophisticated register allocator
+- integrated BASM (built-in assembler) parser
+  - supports ATT syntax used by GNU C
+  - supports Intel syntax used by Turbo Pascal (x86-only)
+- can compile code into assembler source code for these assemblers:
+  - GNU Assembler (GAS)
+  - Netwide assembler (Nasm)
+  - Microsoft Assembler/Turbo Assembler (Masm/Tasm)
+  - Watcom assembler (wasm)
+- internal assembler for ultra fast object file generation
+- can call external C code
+  - h2pas utility to convert .h files to Pascal units
+- smart linking (also known as dead code stripping)
+- support for the GNU debugger
+- integrated development environment (disabled by default on Mac OS X)
+  - powerful user friendly Wordstar compatible multi file editor
+  - context sensitive help supports help files in HTML, Windows HLP and Borland TPH format.
+  - debugger on most platforms
+- can create binaries running natively under both DOS and OS/2 (EMX version)
+- no need for Linux distribution specific binaries, programs you write run on all distributions
+- high quality documentation
+
+
+****************************************************************************
+* Minimum requirements
+****************************************************************************
+
+Processor:
+  i386, x86_64, PowerPC, ARM, MIPS, i8086, Motorola 68k, Sparc or JVM 
+  runtime
+Win32:
+ - MS Windows NT/2000/XP or later (Win95, 98 and ME are not supported in FPC officially any longer).
+ - 16 MB RAM
+OS/2:
+ - OS/2 Warp v3.0 with one of late fixpaks - FP 35 should be fine, OS/2 Warp v4.0 with FP 5 and above, WSeB, MCP or any eComStation version (OS/2 2.0/2.1 currently not supported, not even for compiled programs).
+ - ArcaOS should be OK too, but it hasn't been tested.
+ - Certain features (e.g. Unicode support in the RTL) require proper support only available in later OS/2 versions (at least OS/2 Warp 4.0 FP14), otherwise the functionality may be limited (but the binaries still work even on the older versions, albeit with some limitations).
+Linux:
+ - system running a 2.4.x kernel
+FreeBSD:
+ - There are separate releases for FreeBSD 7.x system or 8.x system. The code works on 6.x too. Older versions might need specific adaptations.
+Mac OS X:
+ - Mac OS X 10.4 and higher
+
+
+****************************************************************************
+* Quick start - Win32
+****************************************************************************
+
+Download the distribution package (fpc-3.2.2.i386-win32.exe) and run it - it is a self-extracting installer, so just follow the instructions to install it. The installer should set the PATH environment variable as appropriate.
+
+To test the compiler, change to the demo\text directory of the FPC tree and type on the command line:
+        fpc hello
+        hello
+
+
+****************************************************************************
+* Quick start - DOS
+****************************************************************************
+
+Download distribution archive (dos322.zip for GO32v2) and unzip it into a temporary directory.
+
+Start the install program INSTALL.EXE and follow the instructions.
+
+Don't forget to set PATH as mentioned by the install program. If running under plain DOS, this can be done by opening file named AUTOEXEC.BAT located in the root directory of your boot drive (usually C:\) with a plain text editor (like EDIT.COM), extending the line starting with "set PATH=" (case insensitive) with path to newly installed binaries (installation root as selected in the installation program appended with "\BIN\GO32v2") and save it.
+
+To test the compiler, change to the demo\text directory of the FPC tree and type
+        fpc hello
+        hello
+
+
+****************************************************************************
+* Quick start - OS/2 / eComStation / ArcaOS
+****************************************************************************
+
+Download distribution archive (os2322full.zip or os2322.zip for OS/2, eComStation or ArcaOS) and unzip it into a temporary directory.
+
+Start the install program INSTALL.EXE and follow the instructions.
+
+Don't forget to set PATH and LIBPATH as mentioned by the install program. This can be done by opening file named CONFIG.SYS located in the root directory of your boot drive (e.g. C:\) with a plain text editor (e.g. E.EXE), extending the lines starting with "set PATH=" and "LIBPATH=" (both are case insensitive) with path to newly installed binaries (installation root as selected in the installation program appended with "\BIN\OS2" for PATH and "\DLL" for LIBPATH) and save it again as a plain text file. Note that changes to LIBPATH require restart of your machine in order to come into effect.
+
+To test the compiler, change to the demo\text directory of the FPC tree and type
+        fpc hello
+        hello
+
+
+****************************************************************************
+* Quick start - Linux/FreeBSD
+****************************************************************************
+
+Download fpc-3.2.2.<cpu>-<os>.tar and untar into a temporary directory.
+
+Start the install script with ./install.sh and follow the instructions.
+
+To test the compiler, change to the demo/text directory of the FPC tree and type
+        fpc hello
+        hello
+
+
+****************************************************************************
+* Quick start - Mac OS X/Darwin
+****************************************************************************
+
+The Xcode command line tools must be installed before FPC is installed. See the download page for more information (the method changes with almost every new Xcode and/or Mac OS X release, so the information in this readme is usually out of date).
+
+There are two methods to install Free Pascal for Mac OS X.
+
+1) Download and install the Mac OS X installer package
+
+2) Install fpc using fink
+
+This second method additionally includes a text mode IDE, which partly works using XQuartz xterm.
+
+
+After installing the package, you can write your source code in your favorite editor (including Project Builder and XCode). To compile something, go to the directory containing your source files in Terminal and type:
+
+        fpc name_of_your_source_file
+
+The compiler only accepts one file name as argument, but will automatically search for and compile any units used by the specified source file. Run "fpc" without any arguments to get an overview of the possible command line options.
+
+
+****************************************************************************
+* Documentation
+****************************************************************************
+
+The documentation is available as HTML pages, PDF, PS, and text although the recommended format is pdf. The latest PDF version is available on ftp://ftp.freepascal.org/fpc/dist/docs-pdf/, other formats are available for download in the directory of the respective distributed release.
+
+NB that there is at present no FPC specific documentation for the platform specific API (like Win32 system functions, etc.). There is a note in the ftp /doc explaining where MS help file documenting Win32 API can be obtained, other platforms (especially Unix-based ones) often come with this documentation included in system installation.
+
+
+****************************************************************************
+* Suggestions, Help, Bug reporting, snapshots,  ...
+****************************************************************************
+
+Suggestions, Help ...
+---------------------
+e-mail: fpc-devel@lists.freepascal.org (bugs, developer related questions)
+e-mail: fpc-pascal@lists.freepascal.org (general pascal related questions)
+
+Both these adresses are for mailing lists. If you're not subscribed, be sure to mention this fact when sending questions to these lists, so that people sending answers know about it and send you a copy. Information about available lists and subscription can be found on http://lists.freepascal.org/mailman/listinfo
+
+Combined with Lazarus, an IDE for the Free Pascal Compiler: Web forum: http://forum.lazarus.freepascal.org (all questions) Wiki: http://wiki.freepascal.org
+
+WWW: http://www.freepascal.org
+FTP: ftp://ftp.freepascal.org/fpc
+(several mirrors exist, see website for links)
+
+Additional information about mailing lists, news, future plans etc. can be found on the web site.
+
+SNAPSHOTS & SOURCES
+-------------------
+One of the features of FPC is the snapshots. These are made daily or weekly from the developers' latest versions of the source. Snapshots are available for GO32v2, Win32 and Linux versions. The latest snapshots are in: ftp://ftp.freepascal.org/fpc/snapshot/ in appropriately named .zip/tar files.
+
+You will also normally find in the snapshot archive file a readme, with a note about the latest included changes. It is quite common, though it doesn't always happen, that when a bug is reported it is fixed and a fixed version can be obtained the NEXT day in the appropriate snapshot.... yes really!
+
+Also on the ftp site you'll find a /dist directory, with the latest distributed releases, a /docs directory, and a /snapshot/<version>/source directory, in which every night at about 0100 GMT the latest source generated by the developers during the day & evening before is exported from SVN into ZIP file fpc.zip.
+
+
+Making your own snapshots
+-------------------------
+By downloading the /source files (makefiles are included) it is possible to make your own version of the fpc compiler/rtl and to modify it. You are of course free to do this so as long as you observe the licence conditions. In order to make the compiler/rtl & IDE in a resonable time (eg <30 minutes) you'll need at least 32 MB of physical memory (64 MB is better), at least a 200 MHz processor and at least 100 MB of free disk space. You'll also need some knowledge of makefiles & programming... it is not difficult but it isn't easy either!
+
+REPORTING BUGS
+----------------
+If you find a bug in the released version, you may want to try a snapshot (see SNAPSHOTS above) to see if it has been fixed before reporting it to the fpc-devel mailing list.
+
+If you find a fault or 'feature' in a release, please report it either using the bug reporting interface at http://bugs.freepascal.org, or to the fpc-devel mailing list. PLEASE ALWAYS INCLUDE A COMPILABLE CODE FRAGMENT that can be used to reproduce the problem (or a link to larger archive if it cannot be reproduced with small example). Also state the FPC version, target platform (Win32, Linux, ...), operating system version (XP, Ubuntu 12.04, ...), the used compiler options and any other useful info so the developers can reproduce the problem. Otherwise they may not be able to fix it.
+
+
+****************************************************************************
+* License
+****************************************************************************
+
+The compiler and most utilities and executables distributed in this package fall under the GPL, for more information read the file COPYING.v2.
+
+Some specific utilities and programs come under the license described in COPYING.v3, COPYING.DJ, COPYING.EMX, COPYING.RSX and licensez.ip.
+
+FPC for JVM comes with some third party tools which are convered by the following licenses:
+  - jasmin.jar comes under the license described in jasminli.txt
+  - bcel-6.0-SNAPSHOT.jar comes under the Apache 2.0 license, described by apache2.txt
+
+Portions of FPC are based on libffi. See libffi.txt for the license of that code.
+
+Some of the licenses of the third party tools require to make the source available. If you cannot find the sources or information where to find them for a certain tool under such a license included into the FPC distribution, please contact us through the contact details given at http://www.freepascal.org/moreinfo.var and we will provide you the sources or information where to find them.
+
+The documentation, unless otherwise noted, is distributed as free text, and is distributed under the GNU Library General Public License as found in file COPYING.
+
+The runtime library, package libraries, free component library, and other libraries which are used to create executables by the compiler come under a modified GNU Library General Public license. Additional information about the library license is found in COPYING.FPC.
+
+License conditions for DPMI provider for GO32v2 version (CWSDPMI.EXE) can be found in cwsdpmi.txt, sources and/or binary updates may be downloaded from http://clio.rice.edu/cwsdpmi/.
+
+The DOS version (go32v2) contains some binaries of DJGPP. You can obtain the full DJGPP package at: http://www.delorie.com/djgpp/
+
+NOTE: OS/2 version of the installer uses the library UNZIP32.DLL from Info-ZIP. Info-ZIP's software (Zip, UnZip and related utilities) is free and can be obtained as source code or executables from Internet/WWW sites, including http://www.info-zip.org.
diff --git a/install/darwin/macos/fpc-intel-macosx/x86/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (Intel).rtf b/install/darwin/macos/fpc-intel-macosx/build/fpc-3.2.2rc1.intelarm64-macosx/Getting Started (Intel and ARM64).rtf
similarity index 61%
rename from install/darwin/macos/fpc-intel-macosx/x86/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (Intel).rtf
rename to install/darwin/macos/fpc-intel-macosx/build/fpc-3.2.2rc1.intelarm64-macosx/Getting Started (Intel and ARM64).rtf
index aba8331a..e3cba721 100644
--- a/install/darwin/macos/fpc-intel-macosx/x86/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (Intel).rtf	
+++ b/install/darwin/macos/fpc-intel-macosx/build/fpc-3.2.2rc1.intelarm64-macosx/Getting Started (Intel and ARM64).rtf	
@@ -1,30 +1,52 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
 \cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fnil\fcharset0 Menlo-Regular;
 \f3\fswiss\fcharset0 Helvetica-Oblique;}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;;}
+{\colortbl;\red255\green255\blue255;\red0\green0\blue0;}
+{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;}
 {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}
-{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
+{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2}
+{\list\listtemplateid3\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid201\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid3}
+{\list\listtemplateid4\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid301\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid4}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}}
 \paperw11900\paperh16840\margl1440\margr1440\vieww23940\viewh15120\viewkind0
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 
 \f0\b\fs24 \cf0 About & requirements
 \f1\b0 \
 \
-This package installs the Free Pascal Compiler 3.2.0rc1 for Intel (32 and 64 bit). It requires Mac OS X 10.4.0 or later with Xcode and the Xcode command line tools installed. Specific Xcode version instructions:\
+This package installs the Free Pascal Compiler 3.2.2rc1 for Mac OS X/Intel (32 and 64 bit) and macOS/ARM64. It can be used to compile for\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls1\ilvl0\cf0 {\listtext	\uc0\u8226 	}
+\ls1\ilvl0\cf0 {\listtext	\uc0\u8226 	}Intel 32 bit (targeting Mac OS X 10.4 and up)\
+{\listtext	\uc0\u8226 	}Intel 64 bit (targeting Mac OS X 10.5 and up)\
+\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
+\ls2\ilvl0\cf0 {\listtext	\uc0\u8226 	}ARM64 (targeting macOS 11.0 and up)\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+\cf0 \
+Requirements:\
+\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
+\ls3\ilvl0\cf0 {\listtext	\uc0\u8226 	}Intel: Mac OS X 10.6.0 or later with Xcode and the Xcode command line tools installed.\
+{\listtext	\uc0\u8226 	}ARM64: macOS 11.0 or later with Xcode and the Xcode command line tools installed.\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+\cf0 \
+Specific Xcode version instructions:\
+\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
+\ls4\ilvl0\cf0 {\listtext	\uc0\u8226 	}
 \f0\b macOS 10.15+ (Catalina and later)
 \f1\b0 : after installing Xcode, open a Terminal window and execute "
 \f2 xcode-select --install"
-\f1  (without the quotes). Additionally, this toolchain no longer supports compiling for Intel 32 bit (i386). If you do want to i386 on macOS 10.15+, you will need an older toolchain and SDK, and specify the path to those to the compiler using the -FD resp. -XR command line parameters.\
+\f1  (without the quotes) followed by "
+\f2 \cf2 \expnd0\expndtw0\kerning0
+sudo xcodebuild -license accept
+\f1 " (again without the quotes)\cf0 \kerning1\expnd0\expndtw0 . Additionally, this toolchain no longer supports compiling for Intel 32 bit (i386). If you do want to target i386 on macOS 10.15+, you will need an older toolchain and SDK, and specify the path to those to the compiler using the -FD resp. -XR command line parameters.\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls1\ilvl0
-\f0\b \cf0 {\listtext	\uc0\u8226 	}Xcode 5+ (OS X 10.9+, macOS 10.12+; for OS X 10.8, see next item):
+\ls4\ilvl0
+\f0\b \cf0 {\listtext	\uc0\u8226 	}Xcode 5+ (OS X 10.9+, macOS 10.12+):
 \f1\b0  after installing Xcode, open a Terminal window and execute "
 \f2 xcode-select --install"
-\f1  (without the quotes)\
+\f1  (without the quotes) followed by "
+\f2 \cf2 \expnd0\expndtw0\kerning0
+sudo xcodebuild -license accept
+\f1 " (again without the quotes).\cf0 \kerning1\expnd0\expndtw0 \
 {\listtext	\uc0\u8226 	}
 \f0\b Xcode 4.3-5.x Mac OS X 10.7/OS X 10.8)
 \f1\b0 : after installing Xcode, go to 
@@ -33,23 +55,18 @@ This package installs the Free Pascal Compiler 3.2.0rc1 for Intel (32 and 64 bit
 \f3\i Downloads
 \f1\i0  and install the 
 \f3\i Command Line Tools
-\f1\i0  package\
+\f1\i0  package.\
 {\listtext	\uc0\u8226 	}
 \f0\b Xcode 3.x-4.2 (Mac OS X 10.6)
-\f1\b0 : make sure 
-\f0\b not to deselect
+\f1\b0 : make sure to 
+\f0\b not deselect
 \f1\b0  
 \f3\i UNIX Development Support
 \f1\i0  during the Xcode installation process.\
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 \cf0 \
-This package can be used to compile for\
-\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls2\ilvl0\cf0 {\listtext	\uc0\u8226 	}Intel 32 bit (targeting Mac OS X 10.4 and up)\
-{\listtext	\uc0\u8226 	}Intel 64 bit (targeting Mac OS X 10.5 and up)\
 \pard\tx560\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
-\cf0 \
-To compile for 
+\cf0 To compile for 
 \f0\b iOS
 \f1\b0  (ARM and ARM64, 32 and 64 bit iPhoneSimulator), please download and install the iOS cross-compilation package after installing this one.\
 
@@ -73,7 +90,7 @@ There is a
 \f3\i -k-no_order_inits
 \f1\i0  parameter when compiling a dynamic library (it's only required while compiling the library itself, not while compiling units it uses).\
 \
-This bug has however been 
+This bug has been 
 \f0\b fixed in Xcode 4 and later
 \f1\b0 , so no special parameters are required anymore when using newer versions.\
 \
@@ -87,9 +104,11 @@ This bug has however been
 \
 \'95 You may also want to check out the Light Weight Pascal IDE, available at {\field{\*\fldinst{HYPERLINK "http://www.ragnemalm.se/lightweight/"}}{\fldrslt http://www.ragnemalm.se/lightweight/}}. It is much easier to use than Xcode and recommended if you do not need all the features offered by Xcode.\
 \
-\'95 The compiler can also be used at the command line, in which case you use Terminal to compile programs. For editing source files, you can use your favourite editor. After installation, the compiler -called "fpc"- will be located in the directory /usr/local/bin. You may have to add this directory to your PATH before you can use the compiler from the command line.\
+\'95 The compiler can also be used at the command line, in which case you use Terminal to compile programs. For editing source files, you can use your favourite editor. After installation, the compiler -called "fpc"- will be located in the directory 
+\f2 /usr/local/bin
+\f1 . You may have to add this directory to your PATH before you can use the compiler from the command line.\
 \
-\'95 The documentation is installed in {\field{\*\fldinst{HYPERLINK "file:///Users/Shared/Free%20Pascal%20Compiler/Documentation"}}{\fldrslt file:///Users/Shared/Free Pascal Compiler/Documentation}}.\
+\'95 The documentation is installed in {\field{\*\fldinst{HYPERLINK "file:///Developer/Documentation/Free%20Pascal%20Compiler"}}{\fldrslt file:///Developer/Documentation/Free Pascal Compiler}}.\
 \
 \
 For more information, see the ReadMe.txt file or visit {\field{\*\fldinst{HYPERLINK "https://www.freepascal.org"}}{\fldrslt https://www.freepascal.org}}}
\ No newline at end of file
diff --git a/install/darwin/macos/fpc-intel-macosx/createdmgs.sh b/install/darwin/macos/fpc-intel-macosx/createdmgs.sh
new file mode 100755
index 00000000..d5743234
--- /dev/null
+++ b/install/darwin/macos/fpc-intel-macosx/createdmgs.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -vex
+
+VERSION=3.2.2
+rm -rf build/fpc-"${VERSION}".intelarm64-macosx build/fpc-"${VERSION}".intel-macosx.cross.ios build/fpc-"${VERSION}".intel-macosx.cross.powerpc-macosx build/fpc-"${VERSION}".intel-macosx.cross.jvm
+mkdir -p build/fpc-"${VERSION}".intelarm64-macosx build/fpc-"${VERSION}".intel-macosx.cross.ios build/fpc-"${VERSION}".intel-macosx.cross.powerpc-macosx build/fpc-"${VERSION}".intel-macosx.cross.jvm
+
+cp x86/Users/Shared/Free\ Pascal\ Compiler/Documentation/Getting* What*.txt build/fpc-"${VERSION}".intelarm64-macosx
+cp ios/Users/Shared/Free\ Pascal\ Compiler/Documentation/Getting* build/fpc-"${VERSION}".intel-macosx.cross.ios
+cp ppc/Users/Shared/Free\ Pascal\ Compiler/Documentation/Getting* build/fpc-"${VERSION}".intel-macosx.cross.powerpc-macosx
+cp jvm/Users/Shared/Free\ Pascal\ Compiler/Documentation/Getting* build/fpc-"${VERSION}".intel-macosx.cross.jvm
+
+for file in *.pkgproj
+do
+  builddir=`basename -s .pkgproj $file|sed -e "s/fpc-/fpc-"${VERSION}"./"`
+  (
+  cp ../../../doc/whatsnew.txt "build/$builddir"/"What's New.txt"
+  cp ReadMe.txt "build/$builddir"
+  packagesbuild --build-folder "$PWD"/build/"$builddir" "$file"
+  hdiutil create -ov -fs HFS+ -srcfolder "build/$builddir" -volname `basename "$builddir"` -format UDZO build/`basename "$builddir"`.dmg
+  ) &
+done
+
+#packagebuild --build-folder build/fpc-"${VERSION}".intel-macosx fpc-intel-macosx.pkgproj 
+#packagebuild --build-folder build/fpc-"${VERSION}".intel-macosx.cross.ios fpc-intel-macosx.cross.ios.pkgproj
+#packagebuild --build-folder build/fpc-"${VERSION}".intel-macosx fpc-intel-macosx.pkgproj
+#packagebuild --build-folder build/fpc-"${VERSION}".intel-macosx fpc-intel-macosx.pkgproj
+
+#for dir in build/*/
+#do
+#  hdiutil create -fs HFS+ -srcfolder "$dir" -volname `basename "$dir"` -format UDZO `basename $dir`.dmg &
+#done
+wait
diff --git a/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.ios.pkgproj b/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.ios.pkgproj
index 1436b2ef..c244ebb8 100644
--- a/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.ios.pkgproj
+++ b/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.ios.pkgproj
@@ -554,11 +554,11 @@
 				<key>FOLLOW_SYMBOLIC_LINKS</key>
 				<false/>
 				<key>IDENTIFIER</key>
-				<string>org.freepascal.freePascalCompiler320.fpcinstx86-ios</string>
+				<string>org.freepascal.freePascalCompiler322.fpcinstx86-ios</string>
 				<key>LOCATION</key>
 				<integer>0</integer>
 				<key>NAME</key>
-				<string>fpc-3.2.0rc1.intel-macosx.cross.ios</string>
+				<string>fpc-3.2.2.intel-macosx.cross.ios</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>PAYLOAD_SIZE</key>
@@ -570,7 +570,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.0</string>
+				<string>2.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -755,9 +755,9 @@
 						<key>VALUE</key>
 						<dict>
 							<key>PATH</key>
-							<string>/Volumes/Data/dev/fpcbuild/install/doc/readme.txt</string>
+							<string>/Volumes/Data/dev/fpcbuild/install/darwin/macos/fpc-intel-macosx/ReadMe.txt</string>
 							<key>PATH_TYPE</key>
-							<integer>0</integer>
+							<integer>1</integer>
 						</dict>
 					</dict>
 				</array>
@@ -775,7 +775,7 @@
 						<key>LANGUAGE</key>
 						<string>English</string>
 						<key>VALUE</key>
-						<string>Free Pascal Compiler for Intel 3.2.0rc1 - iOS cross-compilers</string>
+						<string>Free Pascal Compiler for Intel 3.2.2 - iOS cross-compilers</string>
 					</dict>
 				</array>
 			</dict>
@@ -831,7 +831,7 @@
 						<integer>0</integer>
 						<key>IC_REQUIREMENT_FILES_LIST</key>
 						<array>
-							<string>/usr/local/lib/fpc/3.2.0/ppcx64</string>
+							<string>/usr/local/lib/fpc/3.2.2/ppcx64</string>
 						</array>
 						<key>IC_REQUIREMENT_FILES_SELECTOR</key>
 						<integer>0</integer>
@@ -846,11 +846,11 @@
 							<key>LANGUAGE</key>
 							<string>English</string>
 							<key>VALUE</key>
-							<string>Please install FPC 3.2.0rc1 for Intel before installing these cross-compilers.</string>
+							<string>Please install FPC 3.2.2 for Intel before installing these cross-compilers.</string>
 						</dict>
 					</array>
 					<key>NAME</key>
-					<string>FPC 3.2.0rc1 for Intel not yet installed</string>
+					<string>FPC 3.2.2 for Intel not yet installed</string>
 					<key>STATE</key>
 					<true/>
 				</dict>
@@ -867,7 +867,7 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>build</string>
+				<string>build/fpc-3.2.2.intel-macosx.cross.ios</string>
 				<key>PATH_TYPE</key>
 				<integer>1</integer>
 			</dict>
@@ -1040,7 +1040,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>fpc-3.2.0rc1.intel-macosx.cross.ios</string>
+			<string>fpc-3.2.2.intel-macosx.cross.ios</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
diff --git a/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.jvm.pkgproj b/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.jvm.pkgproj
index fc53a2d0..0c0506b7 100644
--- a/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.jvm.pkgproj
+++ b/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.jvm.pkgproj
@@ -554,11 +554,11 @@
 				<key>FOLLOW_SYMBOLIC_LINKS</key>
 				<false/>
 				<key>IDENTIFIER</key>
-				<string>org.freepascal.freePascalCompiler320.fpcinst386-jvm</string>
+				<string>org.freepascal.freePascalCompiler322.fpcinst386-jvm</string>
 				<key>LOCATION</key>
 				<integer>0</integer>
 				<key>NAME</key>
-				<string>fpc-3.2.0rc1.intel-macosx.cross.jvm</string>
+				<string>fpc-3.2.2.intel-macosx.cross.jvm</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>PAYLOAD_SIZE</key>
@@ -570,7 +570,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.0</string>
+				<string>2.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -753,9 +753,9 @@
 						<key>VALUE</key>
 						<dict>
 							<key>PATH</key>
-							<string>/Volumes/Data/dev/fpcbuild/install/doc/readme.txt</string>
+							<string>/Volumes/Data/dev/fpcbuild/install/darwin/macos/fpc-intel-macosx/ReadMe.txt</string>
 							<key>PATH_TYPE</key>
-							<integer>0</integer>
+							<integer>1</integer>
 						</dict>
 					</dict>
 				</array>
@@ -773,7 +773,7 @@
 						<key>LANGUAGE</key>
 						<string>English</string>
 						<key>VALUE</key>
-						<string>Free Pascal Compiler for Intel 3.2.0rc1 - JVM cross-compilers</string>
+						<string>Free Pascal Compiler for Intel 3.2.2 - JVM cross-compilers</string>
 					</dict>
 				</array>
 			</dict>
@@ -829,7 +829,7 @@
 						<integer>0</integer>
 						<key>IC_REQUIREMENT_FILES_LIST</key>
 						<array>
-							<string>/usr/local/lib/fpc/3.2.0/ppcx64</string>
+							<string>/usr/local/lib/fpc/3.2.2/ppcx64</string>
 						</array>
 						<key>IC_REQUIREMENT_FILES_SELECTOR</key>
 						<integer>0</integer>
@@ -844,11 +844,11 @@
 							<key>LANGUAGE</key>
 							<string>English</string>
 							<key>VALUE</key>
-							<string>Please install FPC 3.2.0rc1 for Intel before installing these cross-compilers.</string>
+							<string>Please install FPC 3.2.2 for Intel before installing these cross-compilers.</string>
 						</dict>
 					</array>
 					<key>NAME</key>
-					<string>FPC 3.2.0rc1 for Intel not yet installed</string>
+					<string>FPC 3.2.2 for Intel not yet installed</string>
 					<key>STATE</key>
 					<true/>
 				</dict>
@@ -865,7 +865,7 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>build/fpc-3.2.0rc1.intel-macosx.cross.jvm</string>
+				<string>build/fpc-3.2.2.intel-macosx.cross.jvm</string>
 				<key>PATH_TYPE</key>
 				<integer>1</integer>
 			</dict>
@@ -1038,7 +1038,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>fpc-3.2.0rc1.intel-macosx.cross.jvm</string>
+			<string>fpc-3.2.2.intel-macosx.cross.jvm</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
diff --git a/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.powerpc-macosx.pkgproj b/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.powerpc-macosx.pkgproj
index fb0843fc..0c864b0e 100644
--- a/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.powerpc-macosx.pkgproj
+++ b/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.cross.powerpc-macosx.pkgproj
@@ -554,11 +554,11 @@
 				<key>FOLLOW_SYMBOLIC_LINKS</key>
 				<false/>
 				<key>IDENTIFIER</key>
-				<string>org.freepascal.freePascalCompiler320.fpcinst386-ppc</string>
+				<string>org.freepascal.freePascalCompiler322.fpcinst386-ppc</string>
 				<key>LOCATION</key>
 				<integer>0</integer>
 				<key>NAME</key>
-				<string>fpc-3.2.0rc1.intel-macosx.cross.powerpc-macosx</string>
+				<string>fpc-3.2.2.intel-macosx.cross.powerpc-macosx</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>PAYLOAD_SIZE</key>
@@ -570,7 +570,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.0</string>
+				<string>2.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -753,9 +753,9 @@
 						<key>VALUE</key>
 						<dict>
 							<key>PATH</key>
-							<string>/Volumes/Data/dev/fpcbuild/install/doc/readme.txt</string>
+							<string>/Volumes/Data/dev/fpcbuild/install/darwin/macos/fpc-intel-macosx/ReadMe.txt</string>
 							<key>PATH_TYPE</key>
-							<integer>0</integer>
+							<integer>1</integer>
 						</dict>
 					</dict>
 				</array>
@@ -773,7 +773,7 @@
 						<key>LANGUAGE</key>
 						<string>English</string>
 						<key>VALUE</key>
-						<string>Free Pascal Compiler for Intel 3.2.0rc1 - PowerPC cross-compilers</string>
+						<string>Free Pascal Compiler for Intel 3.2.2 - PowerPC cross-compilers</string>
 					</dict>
 				</array>
 			</dict>
@@ -829,7 +829,7 @@
 						<integer>0</integer>
 						<key>IC_REQUIREMENT_FILES_LIST</key>
 						<array>
-							<string>/usr/local/lib/fpc/3.2.0/ppcx64</string>
+							<string>/usr/local/lib/fpc/3.2.2/ppcx64</string>
 						</array>
 						<key>IC_REQUIREMENT_FILES_SELECTOR</key>
 						<integer>0</integer>
@@ -844,11 +844,11 @@
 							<key>LANGUAGE</key>
 							<string>English</string>
 							<key>VALUE</key>
-							<string>Please install FPC 3.2.0rc1 for Intel before installing these cross-compilers.</string>
+							<string>Please install FPC 3.2.2 for Intel before installing these cross-compilers.</string>
 						</dict>
 					</array>
 					<key>NAME</key>
-					<string>FPC 3.2.0rc1 for Intel not yet installed</string>
+					<string>FPC 3.2.2 for Intel not yet installed</string>
 					<key>STATE</key>
 					<true/>
 				</dict>
@@ -865,7 +865,7 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>ppc</string>
+				<string>build/fpc-3.2.2.intel-macosx.cross.powerpc-macosx</string>
 				<key>PATH_TYPE</key>
 				<integer>1</integer>
 			</dict>
@@ -1038,7 +1038,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>fpc-3.2.0rc1.intel-macosx.cross.powerpc-macosx</string>
+			<string>fpc-3.2.2.intel-macosx.cross.powerpc-macosx</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
diff --git a/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.pkgproj b/install/darwin/macos/fpc-intel-macosx/fpc-intelarm64-macosx.pkgproj
similarity index 94%
rename from install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.pkgproj
rename to install/darwin/macos/fpc-intel-macosx/fpc-intelarm64-macosx.pkgproj
index 128f50fc..8daa254b 100644
--- a/install/darwin/macos/fpc-intel-macosx/fpc-intel-macosx.pkgproj
+++ b/install/darwin/macos/fpc-intel-macosx/fpc-intelarm64-macosx.pkgproj
@@ -475,7 +475,7 @@
 				<key>PREINSTALL_PATH</key>
 				<dict>
 					<key>PATH_TYPE</key>
-					<integer>0</integer>
+					<integer>1</integer>
 				</dict>
 				<key>RESOURCES</key>
 				<array/>
@@ -489,11 +489,11 @@
 				<key>FOLLOW_SYMBOLIC_LINKS</key>
 				<false/>
 				<key>IDENTIFIER</key>
-				<string>org.freepascal.freePascalCompiler320.fpcinst386</string>
+				<string>org.freepascal.freePascalCompiler322.fpcinstintelarm64</string>
 				<key>LOCATION</key>
 				<integer>0</integer>
 				<key>NAME</key>
-				<string>fpc-3.2.0rc1-intel-macosx</string>
+				<string>fpc-3.2.2-intelarm64-macosx</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>PAYLOAD_SIZE</key>
@@ -505,7 +505,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.0</string>
+				<string>2.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -641,7 +641,7 @@
 						<key>VALUE</key>
 						<dict>
 							<key>PATH</key>
-							<string>x86/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (Intel).rtf</string>
+							<string>x86/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (Intel and ARM64).rtf</string>
 							<key>PATH_TYPE</key>
 							<integer>1</integer>
 						</dict>
@@ -677,7 +677,7 @@
 						<key>VALUE</key>
 						<dict>
 							<key>PATH</key>
-							<string>../../../doc/readme.txt</string>
+							<string>ReadMe.txt</string>
 							<key>PATH_TYPE</key>
 							<integer>1</integer>
 						</dict>
@@ -697,7 +697,7 @@
 						<key>LANGUAGE</key>
 						<string>English</string>
 						<key>VALUE</key>
-						<string>Free Pascal Compiler Intel 3.2.0rc1</string>
+						<string>Free Pascal Compiler Intel and ARM64 3.2.2</string>
 					</dict>
 				</array>
 			</dict>
@@ -708,37 +708,42 @@
 			<array>
 				<dict>
 					<key>BEHAVIOR</key>
-					<integer>3</integer>
+					<integer>2</integer>
 					<key>DICTIONARY</key>
 					<dict>
-						<key>IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY</key>
-						<integer>2</integer>
-						<key>IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE</key>
+						<key>IC_REQUIREMENT_SCRIPT_ARGUMENTS</key>
+						<array/>
+						<key>IC_REQUIREMENT_SCRIPT_COMPARATOR</key>
 						<integer>0</integer>
-						<key>IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT</key>
-						<integer>1</integer>
-						<key>IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY</key>
-						<integer>866666</integer>
-						<key>IC_REQUIREMENT_CPU_POWERPC_ARCHITECTURE_TYPE</key>
+						<key>IC_REQUIREMENT_SCRIPT_EMBED</key>
+						<true/>
+						<key>IC_REQUIREMENT_SCRIPT_PATH</key>
+						<dict>
+							<key>PATH</key>
+							<string>../CommandLineToolsCheck</string>
+							<key>PATH_TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<key>IC_REQUIREMENT_SCRIPT_VALUE</key>
 						<integer>0</integer>
 					</dict>
 					<key>IC_REQUIREMENT_CHECK_TYPE</key>
 					<integer>0</integer>
 					<key>IDENTIFIER</key>
-					<string>fr.whitebox.Packages.requirement.cpu</string>
+					<string>fr.whitebox.Packages.requirement.scripts</string>
 					<key>MESSAGE</key>
 					<array>
 						<dict>
 							<key>LANGUAGE</key>
 							<string>English</string>
 							<key>SECONDARY_VALUE</key>
-							<string>This package contains only Intel binaries, which cannot be used on a PowerPC-based Macintosh. Install the PowerPC version of FPC instead.</string>
+							<string>You must install the Xcode command line tools BEFORE installing FPC, otherwise the generated FPC configuration file will be incomplete. For more information, see the pages linked from https://www.freepascal.org/down/i386/macosx.html</string>
 							<key>VALUE</key>
-							<string></string>
+							<string>Install Xcode Command Line Tools</string>
 						</dict>
 					</array>
 					<key>NAME</key>
-					<string>Processor</string>
+					<string>Result of External Script</string>
 					<key>STATE</key>
 					<true/>
 				</dict>
@@ -751,11 +756,11 @@
 		<key>PROJECT_SETTINGS</key>
 		<dict>
 			<key>BUILD_FORMAT</key>
-			<integer>0</integer>
+			<integer>1</integer>
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>x86</string>
+				<string>build/fpc-3.2.2.intelarm64-macosx</string>
 				<key>PATH_TYPE</key>
 				<integer>1</integer>
 			</dict>
@@ -928,13 +933,18 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>fpc-3.2.0rc1-intel-macosx</string>
+			<string>fpc-3.2.2-intelarm64-macosx</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
 			<false/>
 		</dict>
 	</dict>
+	<key>SHARED_GLOBAL_DATA</key>
+	<dict>
+		<key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
+		<string></string>
+	</dict>
 	<key>TYPE</key>
 	<integer>0</integer>
 	<key>VERSION</key>
diff --git a/install/darwin/macos/fpc-intel-macosx/ios/Users/Shared/Free Pascal Compiler/Documentation/Getting Started - iOS.rtf b/install/darwin/macos/fpc-intel-macosx/ios/Users/Shared/Free Pascal Compiler/Documentation/Getting Started - iOS.rtf
index cbc52a5b..e96ea768 100644
--- a/install/darwin/macos/fpc-intel-macosx/ios/Users/Shared/Free Pascal Compiler/Documentation/Getting Started - iOS.rtf	
+++ b/install/darwin/macos/fpc-intel-macosx/ios/Users/Shared/Free Pascal Compiler/Documentation/Getting Started - iOS.rtf	
@@ -18,12 +18,14 @@
 {\list\listtemplateid13\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1201\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid13}
 {\list\listtemplateid14\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1301\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid14}
 {\list\listtemplateid15\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1401\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid15}
-{\list\listtemplateid16\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1501\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid16}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}}
+{\list\listtemplateid16\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1501\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid16}
+{\list\listtemplateid17\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1601\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid17}
+{\list\listtemplateid18\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{hyphen\}}{\leveltext\leveltemplateid1701\'01\uc0\u8259 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid18}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}}
 \paperw11900\paperh16840\margl1440\margr1440\vieww22440\viewh13060\viewkind0
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 
-\f0\b\fs36 \cf0 \ul \ulc0 Free Pascal for iOS 3.2.0rc1
+\f0\b\fs36 \cf0 \ul \ulc0 Free Pascal for iOS 3.2.2
 \f1\b0 \ulnone \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 
@@ -46,7 +48,7 @@
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 
 \f1\b0 \cf0 \ulnone \
-This package will install the Free Pascal Compiler 3.2.0rc1 for running on Intel-based Macs to create iOS applications. It includes support for 
+This package will install the Free Pascal Compiler 3.2.2 for running on Intel-based Macs to create iOS applications. It includes support for 
 \f0\b ARM (32 bit ARMv7),
 \f1\b0  
 \f0\b ARM64
@@ -125,17 +127,33 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \
 
 \f0\b \ul 4. Version history\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+\cf0 \ulnone \'95 3.2.2 
+\f1\b0 (16 May 2021):\
+\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
+\ls2\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.2.2\ul \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+
+\f0\b \cf0 \ulc0 \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+\cf0 \ulnone \'95 3.2.2rc1 
+\f1\b0 (20 March 2021):\
+\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
+\ls3\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.2.2tc1\ul \
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+
+\f0\b \cf0 \
 \ulnone \'95 3.2.0 
 \f1\b0 (1 May 2020):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls2\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.2.0\ul \
+\ls4\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.2.0\ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 
 \f0\b \cf0 \
 \ulnone \'95 3.0.5 
 \f1\b0 (26 November 2017):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls3\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.0.4\ul \
+\ls5\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.0.4\ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 \cf0 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
@@ -143,7 +161,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \f0\b \cf0 \ulnone \'95 3.0.3 
 \f1\b0 (14 February 2017):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls4\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.0.2\ul \
+\ls6\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.0.2\ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 \cf0 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
@@ -151,7 +169,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \f0\b \cf0 \ulnone \'95 3.0.1 
 \f1\b0 (15th November 2015):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls5\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.0\ul \
+\ls7\ilvl0\cf0 {\listtext	\uc0\u8259 	}Synchronised with FPC 3.0\ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 \cf0 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
@@ -159,14 +177,14 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \f0\b \cf0 \ulnone \'95 3.0.1 
 \f1\b0 (11th October 2015):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls6\ilvl0\cf0 {\listtext	\uc0\u8259 	}Resolved compatibility issues with Xcode 7\
+\ls8\ilvl0\cf0 {\listtext	\uc0\u8259 	}Resolved compatibility issues with Xcode 7\
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 
 \f0\b \cf0 \
 \'95 3.0.1 
 \f1\b0 (9th August 2015):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls7\ilvl0\cf0 {\listtext	\uc0\u8259 	}Support for ARM64 (AArch64)\
+\ls9\ilvl0\cf0 {\listtext	\uc0\u8259 	}Support for ARM64 (AArch64)\
 {\listtext	\uc0\u8259 	}Support for 64 bit iPhoneSimulator\
 {\listtext	\uc0\u8259 	}Removed the old Xcode project and related information\
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
@@ -175,7 +193,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \'95 2.6.2rc1 
 \f1\b0 (31st December 2011):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls8\ilvl0\cf0 {\listtext	\uc0\u8259 	}Support in the installation script for Xcode.app bundles installed in /Applications\
+\ls10\ilvl0\cf0 {\listtext	\uc0\u8259 	}Support in the installation script for Xcode.app bundles installed in /Applications\
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 \cf0 \ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
@@ -183,7 +201,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \f0\b \cf0 \ulnone \'95 2.6.0 
 \f1\b0 (31st December 2011):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls9\ilvl0\cf0 {\listtext	\uc0\u8259 	}No changes\
+\ls11\ilvl0\cf0 {\listtext	\uc0\u8259 	}No changes\
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 \cf0 \ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
@@ -191,7 +209,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \f0\b \cf0 \ulnone \'95 2.6.0rc1 
 \f1\b0 (16th October 2011):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls10\ilvl0\cf0 {\listtext	\uc0\u8259 	}Generic support for any iOS SDK version in the installation script\
+\ls12\ilvl0\cf0 {\listtext	\uc0\u8259 	}Generic support for any iOS SDK version in the installation script\
 {\listtext	\uc0\u8259 	}Include both ARMv6/VFPv2 and ARMv7/VFPv3 versions of the object files\
 {\listtext	\uc0\u8259 	}Support for Simulator SDK in Xcode 3.2.4 and later via the "iphonesim" target\
 {\listtext	\uc0\u8259 	}Xcode template adjusted so it can build ARMv6/ARMv7 universal binaries, uses the iphonesim target when compiling for i386, and extra options to specify architecture-specific parameters to the compiler\
@@ -202,7 +220,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \f0\b \cf0 \ulnone \'95 2.4.2 
 \f1\b0 (9th November 2010):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls11\ilvl0\cf0 {\listtext	\uc0\u8259 	}Also add hypothetical iOS 4.3 support\
+\ls13\ilvl0\cf0 {\listtext	\uc0\u8259 	}Also add hypothetical iOS 4.3 support\
 {\listtext	\uc0\u8259 	}Install the project template again in the right directory (
 \f3\i /Developer/Library/Xcode/Shared/Project Templates
 \f1\i0  instead of 
@@ -214,7 +232,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \'95 2.4.2rc1 
 \f1\b0 (2nd October 2010):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls12\ilvl0\cf0 {\listtext	\uc0\u8259 	}The MacOSAll unit is now available for iPhoneOS/iOS targets\
+\ls14\ilvl0\cf0 {\listtext	\uc0\u8259 	}The MacOSAll unit is now available for iPhoneOS/iOS targets\
 {\listtext	\uc0\u8259 	}Installation script supports up to iOS SDK 4.2\
 {\listtext	\uc0\u8259 	}Mention that the iPhoneSimulator shipped with the 3.2 SDK and later is not yet supported with this release\ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
@@ -223,7 +241,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \'95 2.4.0rc1 
 \f1\b0 (20th December 2009):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls13\ilvl0\cf0 {\listtext	\uc0\u8259 	}Some small language cleanups in this readme\ul \
+\ls15\ilvl0\cf0 {\listtext	\uc0\u8259 	}Some small language cleanups in this readme\ul \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
 \cf0 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
@@ -231,7 +249,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \f0\b \cf0 \ulnone \'95 2.4.0rc1 
 \f1\b0 (1st November 2009):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls14\ilvl0\cf0 {\listtext	\uc0\u8259 	}Tested up to and including Xcode 3.2\
+\ls16\ilvl0\cf0 {\listtext	\uc0\u8259 	}Tested up to and including Xcode 3.2\
 {\listtext	\uc0\u8259 	}Mention that future FPC versions will include MacOSAll for the iPhone/iPod Touch\
 {\listtext	\uc0\u8259 	}Only compile/install the ARM version of the compiler (since we now require FPC 3.0rc1rc1 to be installed already)\
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
@@ -241,7 +259,7 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \f0\b \cf0 \ulnone \'95 2.3.1v2 
 \f1\b0 (17th January 2009):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls15\ilvl0\cf0 {\listtext	\uc0\u8259 	}Mention that you need a certificate from Apple to run self-written applications on an iPhone/iPod Touch\
+\ls17\ilvl0\cf0 {\listtext	\uc0\u8259 	}Mention that you need a certificate from Apple to run self-written applications on an iPhone/iPod Touch\
 {\listtext	\uc0\u8259 	}Installation script mentions its location whenever it aborts\
 {\listtext	\uc0\u8259 	}Link to wiki page with more information\
 {\listtext	\uc0\u8259 	}Xcode template now ignores FPC configuration files\
@@ -253,5 +271,5 @@ Questions or remarks regarding the templates themselves can be sent to either li
 \f0\b \cf0 \ulnone \'95 2.3.1v1 
 \f1\b0 (9th January 2009):\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
-\ls16\ilvl0\cf0 {\listtext	\uc0\u8259 	}Initial release\
+\ls18\ilvl0\cf0 {\listtext	\uc0\u8259 	}Initial release\
 }
\ No newline at end of file
diff --git a/install/darwin/macos/fpc-intel-macosx/jvm/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (JVM).txt b/install/darwin/macos/fpc-intel-macosx/jvm/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (JVM).txt
index 2c414959..d7ed4e79 100644
--- a/install/darwin/macos/fpc-intel-macosx/jvm/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (JVM).txt	
+++ b/install/darwin/macos/fpc-intel-macosx/jvm/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (JVM).txt	
@@ -1,6 +1,6 @@
 About & requirements
 
-This package installs the Free Pascal Compiler 3.2.0rc1 for JVM. It requires the JDK 1.5 or later to be installed and the "java" executable to be in the PATH.
+This package installs the Free Pascal Compiler 3.2.2 for JVM. It requires the JDK 1.5 or later to be installed and the "java" executable to be in the PATH.
 
 This package can be used to compile for
   • Java JVM 1.5 or later
@@ -16,7 +16,7 @@ You can find an overview of the supported language and RTL features at http://wi
 Instead of the standard FPC RTL and packages, you can make use of the standard JDK (1.5)/Android DK (r14) classes via resp. the jdk15 and androidr14 units.
 
 To run applications, you have to add the FPC RTL units to the java classpath. You can do so with the -cp command line parameter, e.g.
-  java -cp /usr/local/lib/fpc/3.2.0/units/jvm-java/rtl:. Program
+  java -cp /usr/local/lib/fpc/3.2.2/units/jvm-java/rtl:. Program
 
 Note the ":." at the end, because you have to add the current directory explicitly to the classpath if you specify it explicitly.
 
diff --git a/install/darwin/macos/fpc-intel-macosx/ppc/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (PowerPC Cross).rtf b/install/darwin/macos/fpc-intel-macosx/ppc/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (PowerPC Cross).rtf
index c53fbbbc..c34dd02f 100644
--- a/install/darwin/macos/fpc-intel-macosx/ppc/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (PowerPC Cross).rtf	
+++ b/install/darwin/macos/fpc-intel-macosx/ppc/Users/Shared/Free Pascal Compiler/Documentation/Getting Started (PowerPC Cross).rtf	
@@ -12,7 +12,7 @@
 \f0\b\fs24 \cf0 About & requirements
 \f1\b0 \
 \
-This package installs the Free Pascal Compiler 3.2.0rc1 for running on Intel to compile PowerPC 32 bit and 64 bit programs. It requires the regular Free Pascal Compiler 3.2.0rc1 for Intel package to be already installed.\
+This package installs the Free Pascal Compiler 3.2.2 for running on Intel to compile PowerPC 32 bit and 64 bit programs. It requires the regular Free Pascal Compiler 3.2.2 for Intel package to be already installed.\
 \
 This package can be used to compile for\
 \pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\pardirnatural\partightenfactor0
@@ -66,7 +66,9 @@ This bug has been
 \f0\b Usage
 \f1\b0 \
 \
-\'95 If you come from Delphi, you may want to check out Lazarus instead for a more familiar environment: {\field{\*\fldinst{HYPERLINK "http://www.lazarus.freepascal.org"}}{\fldrslt http://www.lazarus.freepascal.org/}}. Note that it cannot be used to compile PowerPC 64 bit GUI programs for Mac OS X (64 bit Intel works fine).\
+\'95 If you come from Delphi, you may want to check out Lazarus instead for a more familiar environment: {\field{\*\fldinst{HYPERLINK "http://www.lazarus.freepascal.org"}}{\fldrslt http://www.lazarus.freepascal.org/}}. Note that it cannot be used to compile PowerPC 64 bit GUI programs for Mac OS X (64 bit Intel and ARM64 works fine).\
+\
+\'95 The {\field{\*\fldinst{HYPERLINK "https://wiki.freepascal.org"}}{\fldrslt Free Pascal and Lazarus wiki}} contains a lot of extra information. It also has a {\field{\*\fldinst{HYPERLINK "https://wiki.freepascal.org/Category:macOS"}}{\fldrslt macOS category}}.\
 \
 \'95 Xcode 4 templates, mainly geared at developing using the Objective-Pascal dialect, can be found at {\field{\*\fldinst{HYPERLINK "http://web.me.com/macpgmr/ObjP/Xcode4/"}}{\fldrslt https://macpgmr.github.io/}}.\
 \
diff --git a/install/darwin/macos/fpc-powerpc-macosx/fpc-powerpc-macosx.packproj b/install/darwin/macos/fpc-powerpc-macosx/fpc-powerpc-macosx.packproj
new file mode 100644
index 00000000..ac107edd
--- /dev/null
+++ b/install/darwin/macos/fpc-powerpc-macosx/fpc-powerpc-macosx.packproj
@@ -0,0 +1,895 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Hierarchy</key>
+	<dict>
+		<key>Attributes</key>
+		<dict>
+			<key>Documents</key>
+			<dict>
+				<key>Background Image</key>
+				<dict>
+					<key>IFPkgFlagBackgroundAlignment</key>
+					<integer>4</integer>
+					<key>IFPkgFlagBackgroundScaling</key>
+					<integer>1</integer>
+					<key>Mode</key>
+					<integer>0</integer>
+					<key>Path</key>
+					<string></string>
+					<key>Path Type</key>
+					<integer>1</integer>
+				</dict>
+				<key>License</key>
+				<dict>
+					<key>International</key>
+					<dict>
+						<key>Mode</key>
+						<integer>1</integer>
+						<key>Path</key>
+						<string>/Users/jmaebe/fpcinst/license.txt</string>
+						<key>Path Type</key>
+						<integer>1</integer>
+					</dict>
+				</dict>
+				<key>ReadMe</key>
+				<dict>
+					<key>International</key>
+					<dict>
+						<key>Mode</key>
+						<integer>1</integer>
+						<key>Path</key>
+						<string>ReadMe.txt</string>
+						<key>Path Type</key>
+						<integer>2</integer>
+					</dict>
+				</dict>
+				<key>Welcome</key>
+				<dict>
+					<key>International</key>
+					<dict>
+						<key>Mode</key>
+						<integer>1</integer>
+						<key>Path</key>
+						<string>ppc/Developer/Documentation/Free Pascal Compiler/Getting Started (PowerPC).rtf</string>
+						<key>Path Type</key>
+						<integer>2</integer>
+					</dict>
+				</dict>
+			</dict>
+			<key>Files</key>
+			<dict>
+				<key>Compress</key>
+				<true/>
+				<key>Hierarchy</key>
+				<dict>
+					<key>Children</key>
+					<array>
+						<dict>
+							<key>Children</key>
+							<array>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>Utilities</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>Path</key>
+							<string>Applications</string>
+							<key>Path Type</key>
+							<integer>1</integer>
+							<key>Privileges</key>
+							<integer>509</integer>
+							<key>Type</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>Children</key>
+							<array/>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>Path</key>
+							<string>bin</string>
+							<key>Path Type</key>
+							<integer>1</integer>
+							<key>Privileges</key>
+							<integer>493</integer>
+							<key>Type</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>Children</key>
+							<array/>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>Path</key>
+							<string>ppc/Developer</string>
+							<key>Path Type</key>
+							<integer>2</integer>
+							<key>Privileges</key>
+							<integer>493</integer>
+							<key>Type</key>
+							<integer>3</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>Children</key>
+							<array>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>Application Support</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>Documentation</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>Filesystems</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>Frameworks</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>Internet Plug-Ins</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>PreferencePanes</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>Printers</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>Screen Savers</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>Path</key>
+									<string>Scripts</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>509</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>Path</key>
+							<string>Library</string>
+							<key>Path Type</key>
+							<integer>1</integer>
+							<key>Privileges</key>
+							<integer>1021</integer>
+							<key>Type</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>Children</key>
+							<array>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>etc</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>var</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>Path</key>
+							<string>private</string>
+							<key>Path Type</key>
+							<integer>1</integer>
+							<key>Privileges</key>
+							<integer>493</integer>
+							<key>Type</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>Children</key>
+							<array/>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>Path</key>
+							<string>sbin</string>
+							<key>Path Type</key>
+							<integer>1</integer>
+							<key>Privileges</key>
+							<integer>493</integer>
+							<key>Type</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>Children</key>
+							<array>
+								<dict>
+									<key>Children</key>
+									<array>
+										<dict>
+											<key>Children</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>Path</key>
+											<string>Extensions</string>
+											<key>Path Type</key>
+											<integer>1</integer>
+											<key>Privileges</key>
+											<integer>493</integer>
+											<key>Type</key>
+											<integer>1</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>Library</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>Path</key>
+							<string>System</string>
+							<key>Path Type</key>
+							<integer>1</integer>
+							<key>Privileges</key>
+							<integer>493</integer>
+							<key>Type</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>Children</key>
+							<array>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>bin</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>include</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>lib</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>libexec</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array>
+										<dict>
+											<key>Children</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>Path</key>
+											<string>ppc/usr/local/bin</string>
+											<key>Path Type</key>
+											<integer>2</integer>
+											<key>Privileges</key>
+											<integer>493</integer>
+											<key>Type</key>
+											<integer>3</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+										<dict>
+											<key>Children</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>Path</key>
+											<string>ppc/usr/local/lib</string>
+											<key>Path Type</key>
+											<integer>2</integer>
+											<key>Privileges</key>
+											<integer>493</integer>
+											<key>Type</key>
+											<integer>3</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+										<dict>
+											<key>Children</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>Path</key>
+											<string>ppc/usr/local/man</string>
+											<key>Path Type</key>
+											<integer>2</integer>
+											<key>Privileges</key>
+											<integer>493</integer>
+											<key>Type</key>
+											<integer>3</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+										<dict>
+											<key>Children</key>
+											<array/>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>Path</key>
+											<string>ppc/usr/local/share</string>
+											<key>Path Type</key>
+											<integer>2</integer>
+											<key>Privileges</key>
+											<integer>493</integer>
+											<key>Type</key>
+											<integer>3</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>local</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>sbin</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>share</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>Children</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>Path</key>
+									<string>standalone</string>
+									<key>Path Type</key>
+									<integer>1</integer>
+									<key>Privileges</key>
+									<integer>493</integer>
+									<key>Type</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>Path</key>
+							<string>usr</string>
+							<key>Path Type</key>
+							<integer>1</integer>
+							<key>Privileges</key>
+							<integer>493</integer>
+							<key>Type</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>80</integer>
+					<key>Path</key>
+					<string>/</string>
+					<key>Path Type</key>
+					<integer>1</integer>
+					<key>Privileges</key>
+					<integer>1021</integer>
+					<key>Type</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>IFPkgFlagDefaultLocation</key>
+				<string>/</string>
+				<key>Imported Package</key>
+				<false/>
+				<key>Package Path</key>
+				<string></string>
+				<key>Split Forks</key>
+				<false/>
+			</dict>
+			<key>Plugins</key>
+			<dict>
+				<key>PluginsList</key>
+				<array>
+					<dict>
+						<key>Path</key>
+						<string>Introduction</string>
+						<key>Type</key>
+						<integer>0</integer>
+					</dict>
+					<dict>
+						<key>Path</key>
+						<string>ReadMe</string>
+						<key>Type</key>
+						<integer>0</integer>
+					</dict>
+					<dict>
+						<key>Path</key>
+						<string>License</string>
+						<key>Type</key>
+						<integer>0</integer>
+					</dict>
+					<dict>
+						<key>Path</key>
+						<string>Target</string>
+						<key>Type</key>
+						<integer>0</integer>
+					</dict>
+					<dict>
+						<key>Path</key>
+						<string>PackageSelection</string>
+						<key>Type</key>
+						<integer>0</integer>
+					</dict>
+					<dict>
+						<key>Path</key>
+						<string>Install</string>
+						<key>Type</key>
+						<integer>0</integer>
+					</dict>
+					<dict>
+						<key>Path</key>
+						<string>FinishUp</string>
+						<key>Type</key>
+						<integer>0</integer>
+					</dict>
+				</array>
+			</dict>
+			<key>Scripts</key>
+			<dict>
+				<key>Additional Resources</key>
+				<dict>
+					<key>International</key>
+					<array/>
+				</dict>
+				<key>Installation Scripts</key>
+				<dict>
+					<key>IFInstallationScriptsPostflight</key>
+					<dict>
+						<key>Path</key>
+						<string>/Users/jmaebe/fpcinst/postinstall</string>
+						<key>Status</key>
+						<true/>
+					</dict>
+					<key>IFInstallationScriptsPostinstall</key>
+					<dict>
+						<key>Path</key>
+						<string></string>
+						<key>Status</key>
+						<false/>
+					</dict>
+					<key>IFInstallationScriptsPostupgrade</key>
+					<dict>
+						<key>Path</key>
+						<string></string>
+						<key>Status</key>
+						<false/>
+					</dict>
+					<key>IFInstallationScriptsPreflight</key>
+					<dict>
+						<key>Path</key>
+						<string></string>
+						<key>Status</key>
+						<false/>
+					</dict>
+					<key>IFInstallationScriptsPreinstall</key>
+					<dict>
+						<key>Path</key>
+						<string></string>
+						<key>Status</key>
+						<false/>
+					</dict>
+					<key>IFInstallationScriptsPreupgrade</key>
+					<dict>
+						<key>Path</key>
+						<string></string>
+						<key>Status</key>
+						<false/>
+					</dict>
+				</dict>
+				<key>Requirements</key>
+				<array>
+					<dict>
+						<key>AlertDialog</key>
+						<dict>
+							<key>International</key>
+							<dict>
+								<key>MessageKey</key>
+								<string>This package contains only PowerPC binaries, which cannot be used on an Intel-based Macintosh. Install the Intel version of FPC instead (or this is a PowerPC with a frequency lower than 867MHz, in which case you can ignore this warning).</string>
+								<key>TitleKey</key>
+								<string>Wrong System Architecture</string>
+							</dict>
+						</dict>
+						<key>LabelKey</key>
+						<string>Wrong System Architecture</string>
+						<key>Level</key>
+						<integer>1</integer>
+						<key>SpecArgument</key>
+						<string>sysa</string>
+						<key>SpecTag</key>
+						<integer>2</integer>
+						<key>SpecType</key>
+						<string>gestalt</string>
+						<key>Status</key>
+						<true/>
+						<key>TestObject</key>
+						<string>2</string>
+						<key>TestOperator</key>
+						<string>=</string>
+					</dict>
+					<dict>
+						<key>AlertDialog</key>
+						<dict>
+							<key>International</key>
+							<dict>
+								<key>MessageKey</key>
+								<string>You have to install Xcode and its command line tools before installing this package. See http://www.freepascal.org/down/i386/macosx-netherlands.var for information on how to install the command line tools.</string>
+								<key>TitleKey</key>
+								<string>Command Line Tools not installed</string>
+							</dict>
+						</dict>
+						<key>LabelKey</key>
+						<string>Xcode command line tools</string>
+						<key>Level</key>
+						<integer>0</integer>
+						<key>SpecArgument</key>
+						<string>/usr/lib/crt1.o</string>
+						<key>SpecProperty</key>
+						<string>NSFileSize</string>
+						<key>SpecTag</key>
+						<integer>1</integer>
+						<key>SpecType</key>
+						<string>file</string>
+						<key>Status</key>
+						<true/>
+						<key>TestObject</key>
+						<integer>0</integer>
+						<key>TestOperator</key>
+						<string>!=</string>
+					</dict>
+				</array>
+			</dict>
+			<key>Settings</key>
+			<dict>
+				<key>Description</key>
+				<dict>
+					<key>International</key>
+					<dict>
+						<key>IFPkgDescriptionDeleteWarning</key>
+						<string></string>
+						<key>IFPkgDescriptionDescription</key>
+						<string></string>
+						<key>IFPkgDescriptionTitle</key>
+						<string>fpc-3.0.4.powerpc-macosx</string>
+						<key>IFPkgDescriptionVersion</key>
+						<string>1.0</string>
+					</dict>
+				</dict>
+				<key>Display Information</key>
+				<dict>
+					<key>CFBundleGetInfoString</key>
+					<string>Free Pascal Compiler 3.2.2 Copyright © 2021 Florian Klaempfl and others</string>
+					<key>CFBundleIconFile</key>
+					<string></string>
+					<key>CFBundleIconFile Path Type</key>
+					<integer>1</integer>
+					<key>CFBundleIdentifier</key>
+					<string>org.freepascal.fpc-3-2-2-powerpc-macosx</string>
+					<key>CFBundleName</key>
+					<string>fpc-3.0.4.powerpc-macosx</string>
+					<key>CFBundleShortVersionString</key>
+					<string>1.0</string>
+				</dict>
+				<key>Options</key>
+				<dict>
+					<key>IFPkgFlagAllowBackRev</key>
+					<true/>
+					<key>IFPkgFlagAuthorizationAction</key>
+					<integer>2</integer>
+					<key>IFPkgFlagFollowLinks</key>
+					<true/>
+					<key>IFPkgFlagIsRequired</key>
+					<false/>
+					<key>IFPkgFlagOverwritePermissions</key>
+					<false/>
+					<key>IFPkgFlagRelocatable</key>
+					<false/>
+					<key>IFPkgFlagRestartAction</key>
+					<integer>0</integer>
+					<key>IFPkgFlagRootVolumeOnly</key>
+					<true/>
+					<key>IFPkgFlagUpdateInstalledLanguages</key>
+					<false/>
+				</dict>
+				<key>Version</key>
+				<dict>
+					<key>IFMajorVersion</key>
+					<integer>1</integer>
+					<key>IFMinorVersion</key>
+					<integer>0</integer>
+				</dict>
+			</dict>
+		</dict>
+		<key>IFPkgFlagPackageSelection</key>
+		<integer>0</integer>
+		<key>Name</key>
+		<string>fpc-3.2.2.powerpc-macosx</string>
+		<key>Status</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<integer>1</integer>
+	</dict>
+	<key>Name</key>
+	<string>Project</string>
+	<key>Settings</key>
+	<dict>
+		<key>10.1 Compatibility</key>
+		<false/>
+		<key>Build Path</key>
+		<string>build</string>
+		<key>Build Path Type</key>
+		<integer>2</integer>
+		<key>Comment</key>
+		<string></string>
+		<key>Remove .DS_Store</key>
+		<true/>
+		<key>Remove .pbdevelopment</key>
+		<true/>
+		<key>Remove CVS</key>
+		<false/>
+	</dict>
+</dict>
+</plist>
diff --git a/install/darwin/macos/fpc-powerpc-macosx/fpc-3.2.0rc1.powerpc-macosx.pkgproj b/install/darwin/macos/fpc-powerpc-macosx/fpc-powerpc-macosx.pkgproj
similarity index 98%
rename from install/darwin/macos/fpc-powerpc-macosx/fpc-3.2.0rc1.powerpc-macosx.pkgproj
rename to install/darwin/macos/fpc-powerpc-macosx/fpc-powerpc-macosx.pkgproj
index e1715228..21239822 100644
--- a/install/darwin/macos/fpc-powerpc-macosx/fpc-3.2.0rc1.powerpc-macosx.pkgproj
+++ b/install/darwin/macos/fpc-powerpc-macosx/fpc-powerpc-macosx.pkgproj
@@ -559,7 +559,7 @@
 				<key>LOCATION</key>
 				<integer>0</integer>
 				<key>NAME</key>
-				<string>fpc-3.2.0rc1.powerpc-macosx</string>
+				<string>fpc-3.2.0.powerpc-macosx</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>PAYLOAD_SIZE</key>
@@ -571,7 +571,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.0</string>
+				<string>2.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -754,9 +754,9 @@
 						<key>VALUE</key>
 						<dict>
 							<key>PATH</key>
-							<string>/Volumes/Data/dev/fpcbuild/install/doc/readme.txt</string>
+							<string>../fpc-intel-macosx/ReadMe.txt</string>
 							<key>PATH_TYPE</key>
-							<integer>0</integer>
+							<integer>1</integer>
 						</dict>
 					</dict>
 				</array>
@@ -774,7 +774,7 @@
 						<key>LANGUAGE</key>
 						<string>English</string>
 						<key>VALUE</key>
-						<string>Free Pascal Compiler PowerPC 3.2.0rc1</string>
+						<string>Free Pascal Compiler PowerPC 3.2.0</string>
 					</dict>
 				</array>
 			</dict>
@@ -866,7 +866,7 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>build</string>
+				<string>build/fpc-3.2.0.powerpc-macosx</string>
 				<key>PATH_TYPE</key>
 				<integer>1</integer>
 			</dict>
@@ -1039,7 +1039,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>fpc-3.2.0rc1.powerpc-macosx</string>
+			<string>fpc-3.2.0.powerpc-macosx</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
diff --git a/install/darwin/macos/fpc-powerpc-macosx/ppc/Developer/Documentation/Free Pascal Compiler/Getting Started (PowerPC).rtf b/install/darwin/macos/fpc-powerpc-macosx/ppc/Developer/Documentation/Free Pascal Compiler/Getting Started (PowerPC).rtf
index 2d3158bb..07a30783 100644
--- a/install/darwin/macos/fpc-powerpc-macosx/ppc/Developer/Documentation/Free Pascal Compiler/Getting Started (PowerPC).rtf	
+++ b/install/darwin/macos/fpc-powerpc-macosx/ppc/Developer/Documentation/Free Pascal Compiler/Getting Started (PowerPC).rtf	
@@ -12,8 +12,8 @@
 \f0\b\fs24 \cf0 About & requirements
 \f1\b0 \
 \
-This package installs the Free Pascal Compiler 3.2.0rc1 for PowerPC. It requires Mac OS X 10.4.0 or later with the Mac OS X Developer Tools (Xcode) installed (partial Xcode installs may work, but are unsupported; in particular, when installing Xcode 3.x or 4.x make sure 
-\f0\b not to deselect
+This package installs the Free Pascal Compiler 3.2.2 for PowerPC. It requires Mac OS X 10.4.0 or later with the Mac OS X Developer Tools (Xcode) installed (partial Xcode installs may work, but are unsupported; in particular, when installing Xcode 3.x or 4.x make sure to 
+\f0\b not deselect
 \f1\b0  
 \f2\i UNIX Development Support
 \f1\i0 ).\
@@ -30,7 +30,9 @@ This package can be used to compile for\
 \f0\b \cf0 Usage
 \f1\b0 \
 \
-\'95 If you come from Delphi, you may want to check out Lazarus instead for a more familiar environment: {\field{\*\fldinst{HYPERLINK "http://www.lazarus.freepascal.org"}}{\fldrslt http://www.lazarus.freepascal.org/}}. Note that currently it cannot yet be used to compile 64 bit GUI programs for Mac OS X.\
+\'95 If you come from Delphi, you may want to check out Lazarus instead for a more familiar environment: {\field{\*\fldinst{HYPERLINK "http://www.lazarus.freepascal.org"}}{\fldrslt http://www.lazarus.freepascal.org/}}.\
+\
+\'95 The {\field{\*\fldinst{HYPERLINK "https://wiki.freepascal.org"}}{\fldrslt Free Pascal and Lazarus wiki}} contains much information. It also has a {\field{\*\fldinst{HYPERLINK "https://wiki.freepascal.org/Category:macOS"}}{\fldrslt macOS category}} (although most of it is probably no longer applicable to PowerPC programming).\
 \
 \'95 You may also want to check out the Light Weight Pascal IDE, available at {\field{\*\fldinst{HYPERLINK "http://www.ragnemalm.se/lightweight/"}}{\fldrslt http://www.ragnemalm.se/lightweight/}}. It is much easier to use than Xcode and recommended if you do not need all the features offered by Xcode.\
 \
diff --git a/install/debian/copyright b/install/debian/copyright
index 0e462c2e..03ecc577 100644
--- a/install/debian/copyright
+++ b/install/debian/copyright
@@ -131,8 +131,6 @@ Files:
  demo/graph/mandel.pp
  demo/graph/samegame.pp
  demo/lister/flist.pas
- demo/lister/flist.pas
- demo/lister/lister.pas
  demo/lister/lister.pas
  demo/modex/voxel.pp
  demo/morphos/ahitest.pas
@@ -153,7 +151,6 @@ Files:
  demo/text/magic.pp
  demo/text/qsort.pp
  demo/unix/cgibmp.pp
- demo/unix/cgibmp.pp
  demo/wince/testemu/w32rapi.pp
  demo/wince/testemu/wcetemu.pp
  demo/wince/testemu/wcetrun.pp
@@ -161,7 +158,6 @@ Files:
  fpcdocs/htmwrite8859.pp
  fpcdocs/makehtm.pp
  fpcsrc/compiler/aarch64/cpuinfo.pas
- fpcsrc/compiler/alpha/cpuinfo.pas
  fpcsrc/compiler/arm/cpuinfo.pas
  fpcsrc/compiler/avr/cpuinfo.pas
  fpcsrc/compiler/ccharset.pas
@@ -190,69 +186,68 @@ Files:
  fpcsrc/compiler/utils/mkx86reg.pp
  fpcsrc/compiler/utils/msg2inc.pp
  fpcsrc/compiler/utils/msgdif.pp
- fpcsrc/compiler/vis/cpuinfo.pas
- fpcsrc/ide/fp.pas
- fpcsrc/ide/fpcalc.pas
- fpcsrc/ide/fpcatch.pas
- fpcsrc/ide/fpcodcmp.pas
- fpcsrc/ide/fpcodtmp.pas
- fpcsrc/ide/fpcompil.pas
- fpcsrc/ide/fpconst.pas
- fpcsrc/ide/fpdebug.pas
- fpcsrc/ide/fpdesk.pas
- fpcsrc/ide/fpdpansi.pas
- fpcsrc/ide/fpevalw.pas
- fpcsrc/ide/fphelp.pas
- fpcsrc/ide/fpide.pas
- fpcsrc/ide/fpini.pas
- fpcsrc/ide/fpintf.pas
- fpcsrc/ide/fpkeys.pas
- fpcsrc/ide/fpmansi.inc
- fpcsrc/ide/fpmcomp.inc
- fpcsrc/ide/fpmdebug.inc
- fpcsrc/ide/fpmedit.inc
- fpcsrc/ide/fpmfile.inc
- fpcsrc/ide/fpmhelp.inc
- fpcsrc/ide/fpmingw.pas
- fpcsrc/ide/fpmopts.inc
- fpcsrc/ide/fpmrun.inc
- fpcsrc/ide/fpmsrch.inc
- fpcsrc/ide/fpmtools.inc
- fpcsrc/ide/fpmwnd.inc
- fpcsrc/ide/fpredir.pas
- fpcsrc/ide/fpregs.pas
- fpcsrc/ide/fpswitch.pas
- fpcsrc/ide/fpsymbol.pas
- fpcsrc/ide/fptemplt.pas
- fpcsrc/ide/fptools.pas
- fpcsrc/ide/fpusrscr.pas
- fpcsrc/ide/fputils.pas
- fpcsrc/ide/fpvars.pas
- fpcsrc/ide/fpviews.pas
- fpcsrc/ide/gplprog.pt
- fpcsrc/ide/gplunit.pt
- fpcsrc/ide/wansi.pas
- fpcsrc/ide/wcedit.pas
- fpcsrc/ide/wchmhwrap.pas
- fpcsrc/ide/wconsole.pas
- fpcsrc/ide/weditor.pas
- fpcsrc/ide/whelp.pas
- fpcsrc/ide/whlpview.pas
- fpcsrc/ide/whtml.pas
- fpcsrc/ide/whtmlhlp.pas
- fpcsrc/ide/whtmlscn.pas
- fpcsrc/ide/winclip.pas
- fpcsrc/ide/windebug.pas
- fpcsrc/ide/wini.pas
- fpcsrc/ide/wnghelp.pas
- fpcsrc/ide/woahelp.pas
- fpcsrc/ide/wos2help.pas
- fpcsrc/ide/wresourc.pas
- fpcsrc/ide/wtphwrit.pas
- fpcsrc/ide/wutils.pas
- fpcsrc/ide/wviews.pas
- fpcsrc/ide/wvphelp.pas
- fpcsrc/ide/wwinhelp.pas
+ fpcsrc/package/ide/fp.pas
+ fpcsrc/package/ide/fpcalc.pas
+ fpcsrc/package/ide/fpcatch.pas
+ fpcsrc/package/ide/fpcodcmp.pas
+ fpcsrc/package/ide/fpcodtmp.pas
+ fpcsrc/package/ide/fpcompil.pas
+ fpcsrc/package/ide/fpconst.pas
+ fpcsrc/package/ide/fpdebug.pas
+ fpcsrc/package/ide/fpdesk.pas
+ fpcsrc/package/ide/fpdpansi.pas
+ fpcsrc/package/ide/fpevalw.pas
+ fpcsrc/package/ide/fphelp.pas
+ fpcsrc/package/ide/fpide.pas
+ fpcsrc/package/ide/fpini.pas
+ fpcsrc/package/ide/fpintf.pas
+ fpcsrc/package/ide/fpkeys.pas
+ fpcsrc/package/ide/fpmansi.inc
+ fpcsrc/package/ide/fpmcomp.inc
+ fpcsrc/package/ide/fpmdebug.inc
+ fpcsrc/package/ide/fpmedit.inc
+ fpcsrc/package/ide/fpmfile.inc
+ fpcsrc/package/ide/fpmhelp.inc
+ fpcsrc/package/ide/fpmingw.pas
+ fpcsrc/package/ide/fpmopts.inc
+ fpcsrc/package/ide/fpmrun.inc
+ fpcsrc/package/ide/fpmsrch.inc
+ fpcsrc/package/ide/fpmtools.inc
+ fpcsrc/package/ide/fpmwnd.inc
+ fpcsrc/package/ide/fpredir.pas
+ fpcsrc/package/ide/fpregs.pas
+ fpcsrc/package/ide/fpswitch.pas
+ fpcsrc/package/ide/fpsymbol.pas
+ fpcsrc/package/ide/fptemplt.pas
+ fpcsrc/package/ide/fptools.pas
+ fpcsrc/package/ide/fpusrscr.pas
+ fpcsrc/package/ide/fputils.pas
+ fpcsrc/package/ide/fpvars.pas
+ fpcsrc/package/ide/fpviews.pas
+ fpcsrc/package/ide/gplprog.pt
+ fpcsrc/package/ide/gplunit.pt
+ fpcsrc/package/ide/wansi.pas
+ fpcsrc/package/ide/wcedit.pas
+ fpcsrc/package/ide/wchmhwrap.pas
+ fpcsrc/package/ide/wconsole.pas
+ fpcsrc/package/ide/weditor.pas
+ fpcsrc/package/ide/whelp.pas
+ fpcsrc/package/ide/whlpview.pas
+ fpcsrc/package/ide/whtml.pas
+ fpcsrc/package/ide/whtmlhlp.pas
+ fpcsrc/package/ide/whtmlscn.pas
+ fpcsrc/package/ide/winclip.pas
+ fpcsrc/package/ide/windebug.pas
+ fpcsrc/package/ide/wini.pas
+ fpcsrc/package/ide/wnghelp.pas
+ fpcsrc/package/ide/woahelp.pas
+ fpcsrc/package/ide/wos2help.pas
+ fpcsrc/package/ide/wresourc.pas
+ fpcsrc/package/ide/wtphwrit.pas
+ fpcsrc/package/ide/wutils.pas
+ fpcsrc/package/ide/wviews.pas
+ fpcsrc/package/ide/wvphelp.pas
+ fpcsrc/package/ide/wwinhelp.pas
  fpcsrc/installer/install.pas
  fpcsrc/installer/insthelp.pas
  fpcsrc/installer/scroll.pas
diff --git a/install/doc/faq.htm b/install/doc/faq.htm
index 7d9a0981..ca64010e 100644
--- a/install/doc/faq.htm
+++ b/install/doc/faq.htm
@@ -1,7 +1,10 @@
+
+
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>Free Pascal - Knowledge base</title>
 </head>
 
@@ -17,12 +20,12 @@ <h1>FAQ / Knowledge base</h1>
   <p>This document gives last minute information regarding the compiler. Furthermore,
   it answers frequently asked questions and gives solutions to common problems
   found with Free Pascal. The information presented herein always supersedes those
-  found in the Free Pascal documentation. 
+  found in the Free Pascal documentation.
 
 
 
   <p> For more comprehensive information on the pascal language, and the runtime library
-  calls, consult the Free Pascal manuals. Topics covered in this document : 
+  calls, consult the Free Pascal manuals. Topics covered in this document :
 
 
 <OL>
@@ -65,14 +68,14 @@ <h1>FAQ / Knowledge base</h1>
     <li><a href="#HowToCallCFuncuntions">Calling C functions</a>
     <li><a href="#IntegratedAssemblerSyntax">Integrated Assembler syntax</a>
     <li><a href="#systemnotfound">Unit system not found errors</a>
-    <li><a href="#extensionselect">There is a new language extension that would be really useful. Will you include it?</a> 
+    <li><a href="#extensionselect">There is a new language extension that would be really useful. Will you include it?</a>
     </OL>
    <li>Runtime library related information
    <OL>
 <!--
     <li><a href="#HowToUseGraph">Using the graph unit with Free Pascal</a>
 -->
-    <li><a href="#WrongColors">Why do I get wrong colors when using the graph unit?</a>
+    <li><a href="#WrongColors">Why do I get wrong colours when using the graph unit?</a>
     <li><a href="#fileshare">File sharing and file locks</a>
     <li><a href="#filemode">File denied errors when opening files with reset</a>
    </OL>
@@ -100,7 +103,7 @@ <h1>FAQ / Knowledge base</h1>
     <li><a href="#libci386">Libc is missing on platforms other than i386</a>
     <li><a href="#vgamissing">Why can't the linker find "vga"?</a>
     <li><a href="#unix-asldmissing">Compiler indicates missing as and ld</a>
-    <li><a href="#unix-ld219">An error occurred while linking, or &quot;did you forget -T?&quot;</a>
+    <li><a href="#unix-ld219">link.res syntax error, or &quot;did you forget -T?&quot;</a>
    </OL>
    <li>OS/2-related information
    <OL>
@@ -109,7 +112,9 @@ <h1>FAQ / Knowledge base</h1>
     <li><a href="#os2-dll">Dynamic libraries</a>
     <li><a href="#os2-profile">Profiling</a>
     <li><a href="#os2-dos">Using DOS generated applications under OS/2</a>
-    <li><a href="#instal106os2">INSTALL.EXE complains about a missing TZ variable under OS/2</a>
+    <li><a href="#instal106os2">INSTALL.EXE of version 1.0.6 or below returns an unknown error (-1) under OS/2</a>
+    <br>or<br>
+    <a href="#instal106os2">INSTALL.EXE of version 1.0.6 or above complains about missing TZ variable under OS/2</a>
     <li><a href="#os2-fp">OS/2 compiler not working after upgrading to 1.9.6 or newer</a>
     <li><a href="#os2-as-failing">Compilation under OS/2 fails with error "Can't call the assembler"</a>
    </OL>
@@ -162,18 +167,18 @@ <h1>FAQ / Knowledge base</h1>
         <li><a name='WhatIsFP'></a>
           <h3>What is Free Pascal (FPC)?</h3>
           
-            <p>Originally named FPK-Pascal, the Free Pascal compiler is a 16,32
+            <p>Originally named FPK-Pascal, the Free Pascal compiler is a 16, 32
             and 64 bit Turbo Pascal and Delphi compatible Pascal compiler for
             Linux, Windows, OS/2, FreeBSD, Mac OS X, DOS and
             several other platforms (the number of supported targets grows
             all the time, although not all of them are on the same level as
             the main ones).
-	
+
             <p>The Free Pascal compiler is available for several
-            architectures: x86 (16,32 and 64 bit), ARM, PowerPC (32 and 64 bit),
+            architectures: x86 (16, 32 and 64 bit), ARM, PowerPC (32 and 64 bit),
             SPARC (v8, v9), Java Virtual Machine (under development) and MIPS (little and big endian, under development).
             An older version (the 1.0 series) and current development versions also supported m68k.
-  	  	
+
             <p>The compiler is written in Pascal and is able to compile its
             own sources. The source files are distributed under the GPLv2+ and included.
 
@@ -197,19 +202,20 @@ <h3>What is Free Pascal (FPC)?</h3>
 	      <li>11/2010: 2.4.2 released
 	      <li>05/2011: 2.4.4 released
 	      <li>01/2012: 2.6.0 released
-	      <li>02/2013: 2.6.2 released 
+	      <li>02/2013: 2.6.2 released
 	      <li>03/2014: 2.6.4 released
-	      <li>01/2015: 3.0.0 released  
-	      <li>02/2017: 3.0.2 released  
-	      <li>11/2017: 3.0.4 released  
-	      <li>04/2020: 3.2.0 released  
+	      <li>11/2015: 3.0.0 released
+              <li>02/2017: 3.0.2 released
+              <li>11/2017: 3.0.4 released
+              <li>06/2020: 3.2.0 released
+              <li>05/2021: 3.2.2 released
             </ul>
-            
+          
 
         <li><a name='versions'></a>
           <h3>Which versions exist, and which one should I use?</h3>
           
-            <p>The latest official version is 3.2.0, the first release in the 3.2.x series.
+            <p>The latest official version is 3.2.2, the first minor update in the 3.2.x series.
             New development is performed in the 3.3.x series, which will eventually
             be released as 3.4.0 or 4.0.0, depending on milestones achieved.
 
@@ -222,7 +228,7 @@ <h4>Modern versioning</h4>
 
             <p>With the release of 1.0, the version numbering was
             slightly changed to a system resembling one used for the Linux
-            kernels. 
+            kernels.
 
             <p>
             <ul>
@@ -234,13 +240,14 @@ <h4>Modern versioning</h4>
               2.0 release were numbered 2.0.x, fixes to the 2.2 release 2.2.x, fixes to the 2.4 release as 2.4.x etc</li>
              <li>The new development version after the 2.4.0 release was numbered 2.5.x
               and so on.
-		<li>Repackagings that affect sources are indicated with a single letter as 
+		<li>Repackagings that affect sources are indicated with a single letter as
 			suffix (e.g. 2.0.4a). This is usually the case for platforms that weren't part of the original release round.
-             <li>The stable branch (currently fixes_3_2, previously fixes_3_0)
-                 always has an odd last number (3.0.1, 3.0.3 and 3.2.1). Compilers
-                 with such versions are snapshots, and e.g. a snapshot with 3.0.3
-                 can be anywhere between 3.0.2 and the moment 3.0.4 branched off.
-                 After 3.2.0, the stable branch's number was updated to 3.2.1 etc.
+             <li>The stable branch (currently, fixes_3_0, previously fixes_2_6) always has an odd last number (2.6.1, 2.6.3 and 3.0.1).
+                 Compilers with such versions are snapshots, and e.g. a snapshot with 2.6.1 can
+ 		 be anywhere between 2.6.0 and the moment 2.6.2 branched off (Jan 2013). Likewise,
+		 after the release of 2.6.2 the fixes_2_6 branch identified itself as version 2.6.3 till 2.6.4 branched off (typically
+ 		 two months before its release).  After 2.6.4, the stable branch's number was updated to 2.6.5,
+		 after 3.0.2 to 3.0.3 etc.
             </ul>
             <p>
 
@@ -279,12 +286,12 @@ <h3>Free Pascal and GNU Pascal - a comparison</h3>
             compiler on as many platforms as possible. GNU Pascal tries to
             implement a portable pascal compiler based on POSIX.
             <DT><b>Version:</b>
-            <DD>Currently, Free Pascal is at version 3.2.0 (April 2020). GNU Pascal is stopped
+            <DD>Currently, Free Pascal is at version 3.2.2 (May 2021). GNU Pascal is stopped
             version 2.1 (from 2002, which can be built with several different GCC's as backend;
             their Mac OS X version is an exception though, as it follows the GCC version number).</DD>
             <DT><b>Tracking:</b>
             <DD>Between releases, development versions of FPC are available through daily snapshots
-	        and the source via SVN. GPC issues a set of patches to the last version a few times 
+	        and the source via SVN. GPC issues a set of patches to the last version a few times
             a year, and there are regular snapshot for OS X and Windows, made by users.
             <DT><b>Operating systems:</b>
             <DD>Free Pascal runs on a large number of platforms,
@@ -297,16 +304,16 @@ <h3>Free Pascal and GNU Pascal - a comparison</h3>
             GNU Pascal runs basically on any system that supported by GCC, and for which the build process was verified.
             <DT><b>Bootstrapping:</b>
             <DD>FPC requires a suitable set of binutils (AS, AR, LD) on some platforms, GNU make and a command line bootstrap compiler. New architectures/OSes are cross-compiled.
-	        GPC bootstraps via a suitable version of GCC, and requires a full set of binutils, flex, bison, gmake, a POSIX shell and libtool 
+	        GPC bootstraps via a suitable version of GCC, and requires a full set of binutils, flex, bison, gmake, a POSIX shell and libtool
             <DT><b>Sources:</b>
             <DD>Free Pascal is entirely written in Pascal, while GNU Pascal is written in C (it's an adaptation of the GNU
             C compiler)
             <DT><b>Language:</b>
-            <DD>Free Pascal supports the Borland Pascal dialect, 
+            <DD>Free Pascal supports the Borland Pascal dialect,
             implements the Delphi Object Pascal language, Objective-Pascal and has some support for ISO 7185 Pascal and Mac Pascal extensions.
             GNU Pascal supports ISO 7185, ISO 10206 and (most of) Borland Pascal 7.0
             <DT><b>Extensions:</b>
-            <DD>Free Pascal implements method, function and operator overloading (later Delphi versions have also added these, so strictly they are not extensions anymore).
+            <DD>Free Pascal implements method, function and operator overloading (later Delphi versions have also added these, so strictly they are not extensions anymore)
             GNU Pascal implements operator overloading.
             <DT><b>License:</b>
             <DD>Both compilers come under the GNU GPL.
@@ -324,8 +331,8 @@ <h3>License and copyright information</h3>
             library (RTL) come under a modified Library GNU Public License (LGPL).
             This license does not impose any kind of license on the created applications. It is therefore possible to create closed source
             or proprietary software using the Free Pascal Compiler.
-            
-            <p>The following exception has been added to the LGPL variant 
+
+            <p>The following exception has been added to the LGPL variant
                that applies to the FPC RTL:<p><I> As a special
             exception, the copyright holders of this library give you
             permission to link this library with independent modules to
@@ -356,14 +363,14 @@ <h3>License and copyright information</h3>
             <p> The compiler source code, on the other hand, comes under
             the GNU General Public License, which means that the compiler
             source can only be used in software projects that are distributed
-            under a compatible license (or that are not distributed at all). 
+            under a compatible license (or that are not distributed at all).
           
 
         <li><a name='WhereToGetFP'></a>
           <h3>Getting the compiler</h3>
           
             <p>The latest official stable Free Pascal release is available for download
-            from all <a href="http://www.freepascal.org/download.var">official mirrors</a>
+            from all <a href="http://www.freepascal.org/download.html">official mirrors</a>
           
 
         <li><a name='general-install'></a>
@@ -371,7 +378,7 @@ <h3>Free Pascal installation hints</h3>
            
              <ul>
                <li> Do not install the compiler in a directory that has spaces
-                    in its name, since some of the compiler tools do not like these 
+                    in its name, since some of the compiler tools do not like these
              </ul>
            
 
@@ -383,7 +390,7 @@ <h3>Why do i have to supply a user name and password to get Free Pascal ?</h3>
             <p> You are trying to login to an ftp site. You have to use the login name
             &quot;anonymous&quot; and your e-mail address as your password.
           
-        
+
 
         <li><a name='general-connectftp'></a>
           <h3>Access denied error when connecting to the Free Pascal FTP site</h3>
@@ -394,26 +401,27 @@ <h3>Access denied error when connecting to the Free Pascal FTP site</h3>
             this limit has been reached. The solution is either to wait and
             retry later, or better still use one of the Free Pascal mirror sites.
           
-        
+
 
         <li><a name='snapshot'></a>
           <h3>I want a new version NOW</h3>
 
+            
             <p>In the time between the release of new official versions, you can
             have a look at and test developer versions (so-called "snapshots"). Be
             warned though: this is work in progress, so in addition to old bugs
-            fixed and new features added, this may also contain new bugs. 
+            fixed and new features added, this may also contain new bugs.
 
             <p>Snapshots are generated automatically each night from the current
             source at that moment. Sometimes this may fail due to bigger changes not
             yet fully implemented. If your version does not work, try again one or
-            two days later. 
+            two days later.
 
             <p>The latest snapshot can always be downloaded from the <A
-            href="http://www.freepascal.org/develop.var#snapshot">development</a>
-            web page. 
-          </trn>
-        
+            href="http://www.freepascal.org/develop.html#snapshot">development</a>
+            web page.
+          
+
 
         <li><a name='installsnap'></a>
           <h3>Installing a snapshot</h3>
@@ -423,9 +431,9 @@ <h3>Installing a snapshot</h3>
             program directory of the last official version of Free Pascal (after
             making a backup of the original, of course). You can also extract it into
             an empty directory and then move the files to the program directory,
-            overwriting existing files. 
+            overwriting existing files.
           
-        
+
 
         <li><a name='HOMEWORK'></a>
           <h3>I have to write a program for homework. Can you help?</h3>
@@ -434,7 +442,7 @@ <h3>I have to write a program for homework. Can you help?</h3>
             <p>No. Please, don't send us mail about homework, we are no teachers.
             The Free Pascal development team tries to give good support for the Free
             Pascal compiler and are trying to always reply to emails. If we get
-            emails like this, this becomes harder and harder. 
+            emails like this, this becomes harder and harder.
           
 
         <li><a name="windowsapp"></a>
@@ -445,7 +453,7 @@ <h3>How do I make a real Windows application with windows and menu bars?</h3>
             It won't be just a Windows application, it will also work under Linux, FreeBSD and
             Mac OS X.
           
-        
+
         <li><a name="game"></a>
           <h3>How do I make a game with Free Pascal? Can I make a game like Doom 3?</h3>
           
@@ -460,7 +468,7 @@ <h3>How do I make a game with Free Pascal? Can I make a game like Doom 3?</h3>
             <a href='http://www.lugato.net/thesheepkiller/'>The Sheep Killer</a> is a very simple game and it should not be
             very hard to understand its code.
           
-        
+
         <li><a name='ErrorPos'></a>
           <h3>Getting more information when an application crashes</h3>
           
@@ -472,7 +480,7 @@ <h3>Getting more information when an application crashes</h3>
                 functions in the backtrace with their real name, you have to recompile
                 the RTL with -gl too.
                 <li>For more comprehensive checking, compile the
-                program with debugging information (use the -g command line option) 
+                program with debugging information (use the -g command line option)
                 <li>Load the program in the debugger <PRE>gdb --directory=&lt;src dirs&gt; myprog.exe</PRE>Notes:
                 <ul>
                     <li>Under UNIX systems (Linux, the BSD's), don't add the ".exe" after myprog
@@ -500,22 +508,22 @@ <h3>Getting more information when an application crashes</h3>
 
 
         <li><a name='general-doesntfindfiles'></a>
-          <h3>Compiler seems to skip files in directories that -Fu points to</h3>
+          <h3>Compiler seems to skip files in directories -Fu points to</h3>
           
             <p>This sometimes happens with installation/compilation scripts if the
             copying command doesn't preserve dates. The object files get older than
             the PPU file, and the compiler tries to recompile them. A simple <TT>touch</TT>
-            will solve it. 
+            will solve it.
             <p>
 	        Also note that FPC, contrary to Turbo Pascal keeps track of include files. Modified
             include files or duplicate names can trigger an attempt to recompile.
           
-        
+
 
         <li><a name='binariesbig'></a>
           <h3>Why are the generated binaries so big?</h3>
           
-            There are several reasons and remedies for this: 
+            There are several reasons and remedies for this:
 
             <OL>
                 <li>
@@ -523,23 +531,23 @@ <h3>Why are the generated binaries so big?</h3>
                     the generation of smartlinkable units, use the -CX command
                     line option when compiling your units. To turn on
                     the linking of previously generated smarlinkable units, use the -XX
-                    command line option when compiling a program. 
+                    command line option when compiling a program.
                 <li>Normally, all symbol information is included in the resulting
                     program (for easier debugging). You can remove this by using the -Xs
                     command line option when compiling your program (it will not do
                     anything when compiling units)
                 <li>Turn on optimisations, both for supplied packages (RTL, FV, FCL)
-                    and for your own code, this will also decrease the code size. 
+                    and for your own code, this will also decrease the code size.
            </OL>
 
             Generally Free Pascal generates smaller binaries than modern competing compilers,
             however, it does not hide code in large dynamic libraries. Free Pascal generates
             larger binaries than compilers from long ago do. Large framework libraries result
             in larger executables.
-			
+
 			See also the <a href="http://wiki.freepascal.org/Size_Matters">Size Matters wiki entry</a>.
           
-        
+
 
 
         <li><a name='runerror'></a>
@@ -547,7 +555,7 @@ <h3>Runtime errors</h3>
           
             <p> When an application generated by FPC terminates in an abnormal way,
             it is very likely that a runtime error will be
-            generated. These errors have the form : 
+            generated. These errors have the form :
 
             <PRE>
             Runtime error 201 at $00010F86
@@ -560,7 +568,7 @@ <h3>Runtime errors</h3>
             described in the Free Pascal user's manual, Appendix D. The
             hexadecimal numbers represent the addresses on the call stack when the error occured.
           
-            
+
 
         <li><a name='stdunits'></a>
           <h3>Standard units</h3>
@@ -572,27 +580,29 @@ <h3>Standard units</h3>
           
 
 <!--
-        <li><a name=internaldocs></a>
+        <li><a name='internaldocs'></a>
+        
            <h3>How does the compiler work internally?</h3>
            <p>A draft document describing the internals of the Free Pascal compiler is
            available <a href="ftp://ftp.freepascal.org/pub/fpc/docs/fpc-int10.zip">here</a>.
-           
--->
         
 
-        <li><a name=debugsmart></a>
+-->
+
+
+        <li><a name='debugsmart'></a>
           <h3>Debugging smartlinked code does not fully work</h3>
           
             <p>Debugging smart linked code might not work correctly. This is
             due to the fact that no type information is emitted for
             smartlinked code. If this would not be done, the files
             would become enormous.
-           
+
             <p> While debugging, it is not recommended to use the
             smartlinking option.
           
 
-        
+
 <!--
         <li><a name=debugshared></a>
           <h3>Debugging shared library (dynamic linked library) code does not fully work</h3>
@@ -602,7 +612,7 @@ <h3>Debugging shared library (dynamic linked library) code does not fully work</
               by the Free Pascal compiler is not officially supported.
           
 -->
-        
+
 
 
         <li><a name='cantfindunit'></a>
@@ -615,22 +625,22 @@ <h3>Cannot compile a program using a binary-only version of a unit</h3>
             incompatibility in the PPU file format (which can change across
             compiler versions), or by a change in one of the units of the RTL
             that has changed in between releases.
-            
+
 
             <p>
             To get more information, compile the code using the -vtu (show tried and used unit information)
             compiler switch, and the unit loading phase will be displayed. You might
             discover that the unit being loaded requires to be recompiled because one
             of the unit it uses has changed.
-            
+
 
             <p>If you plan on distributing a module without the source code, the binaries
                should be compiled and made available for all versions of the compiler you
                wish to support, otherwise compilation errors are bound to occur.
           
 
-        
-         
+
+
         <li><a name='isoxpascal'></a>
           <h3>Will you support ISO Extended Pascal?</h3>
           
@@ -661,8 +671,8 @@ <h3>What about .NET?</h3>
 	   academic curiousity (mainly because it could be a pilot for a
 	   generalized backend creating bytecode) there are however several
 	   problems with .NET in combination with FPC:
-	   	
-        <OL> 
+
+        <OL>
         <li>
            Pascal is a language that uses pointers, and existing codebases
 	   can only be unmanaged. Unmanaged code is not portable under .NET,
@@ -687,11 +697,11 @@ <h3>What about .NET?</h3>
  	    ASP.NET does not help either. This makes porting existing code
  	    less useful (since ASP.NET is tied to IIS), and new codebases of
  	    portable code can be set in nearly every language </li>
-	   
+
  	<li>Operating System dependant code would not work anymore, since
-	     the Win32/64 interface is unmanaged. 
+	     the Win32/64 interface is unmanaged.
 	</OL> <p>
-        
+
     So effectively this means that for FPC to benefit from .NET you
     would have to significantly adapt the language (thus compiler) and
     libraries, and be incompatible with the existing native sourcecode.
@@ -709,47 +719,47 @@ <h3>What about .NET?</h3>
     codegenerator, and maybe some base libraries) and if the work is
     suitable for inclusion in FPC (a very big if), we will of course
     include it.<p>
-    
+
     Since support for <a href="http://wiki.freepascal.org/FPC_JVM">generating JVM bytecode</a> has been added to the
     compiler, such a project may be more realistic now than it has been
     in the past. Many of the caveats mentioned above still hold though:
     language compatibility is not 100% and most standard units will have
     to be reimplemented.<p>
-                 
+          
 
    </OL>
    <li><h2>Pascal language related information</h2>
    <OL>
 
         <li><a name='PortingCPU'></a>
-          <h3>Considerations in porting to other processors</h3>
+          <h3>Considerations in porting code to other processors</h3>
 
           
             <p>Because the compiler supports multiple processor architectures, it
             is important to take a few precautions so that your code will execute
-            correctly on all processors. 
+            correctly on all processors.
             <ul>
               <li>Limit your use of asm statements unless it is time critical code
               <li>Try not to rely on the endianness of the specific machines when performing operations depending on data layout. In particular, reading and writing binary data
               to/from files will probably require byte swaps across different endianness
-              machines (swapendian is your friend in this case). Freepascal defines 
+              machines (swapendian is your friend in this case). Freepascal defines
               <CODE>FPC_LITTLE_ENDIAN</CODE> or <CODE>FPC_BIG_ENDIAN</CODE> to indicate the
-              target endianness. 
+              target endianness.
               <li>Try limiting your local variables in subroutines to 32K, as this
               is the limit of some processors. Use dynamic allocation instead.
               <li>Try limiting the size of parameters passed to subroutines to 32K,
               as this is the limit of some processors. Use const or var parameters
-              where appropriate. 
-              <li><TT>CPU16</TT>,<TT>CPU32</TT> or <TT>CPU64</TT> is defined indicating 
-              whether the target is a 16,32-bit or 64-bit cpu. This can help with 
-              incorporating 16,32-bit and 64-bit specific code. 
-              
+              where appropriate.
+              <li><TT>CPU16</TT>,<TT>CPU32</TT> or <TT>CPU64</TT> is defined indicating
+              whether the target is a 16-bit, 32-bit or 64-bit cpu. This can help with
+              incorporating 16-bit, 32-bit and 64-bit specific code.
+
               <li>Use the <TT>ptruint</TT> type when declaring an ordinal that will store
               a pointer, since pointers can be either 32-bit or 64-bit depending on
               the processor and operating system. For 16-bit it is memory model dependent.
             </ul>
           
-        
+
         <p>
 
         <li><a name='PortingOS'></a>
@@ -758,13 +768,13 @@ <h3>Considerations in porting code to other operating systems</h3>
           
             <p>Because the compiler supports several different operating systems,
             is important to take a few precautions so that your code will execute
-            correctly on all systems. 
+            correctly on all systems.
             <ul>
               <li>File sharing is implemented differently on different operating
               systems, so opening already opened files may fail on some operating
               systems (such as Windows). The only correct way to make sure to
               have the same file sharing behavior is to use the I/O routines
-              provided by the <TT>sysutils</TT> unit. 
+              provided by the <TT>sysutils</TT> unit.
               <li>Clean up at the end of your program, i.e. close all files on exit, and
               release all allocated heap memory, as some operating systems do not like it
               when some things are left allocated or opened.
@@ -773,13 +783,13 @@ <h3>Considerations in porting code to other operating systems</h3>
               local variables. Limiting total stack space usage at a given moment to
               at most 256 KBytes will make porting easier.
               <li> Do not hardcode paths to files, try to use relative paths
-              instead 
+              instead
               <li> Use the following constants (defined in the system unit)
               to get information on files, line endings, and to build paths:
                   <ul>
                     <li> <TT>LineEnding</TT> : Indicates the characters which end a text line
                     <li> <TT>LFNSupport</TT> : Indicates if long filenames are supported (more than 8.3 characters)
-                    <li> <TT>DirectorySeparator</TT> : The character or characters that separate path components 
+                    <li> <TT>DirectorySeparator</TT> : The character or characters that separate path components
                     <li> <TT>DriveSeparator</TT> : The character that separates the drive specification from the rest
                            of the path
                     <li> <TT>PathSeparator</TT> : The character that separates directories in the path lists (such as the search path)
@@ -788,10 +798,10 @@ <h3>Considerations in porting code to other operating systems</h3>
                   </ul>
                It is also possible to use the <TT>PathDelim</TT>, <TT>PathSep</TT> and <TT>DriveDelim</TT> constants
                defined in the <TT>sysutils</TT> unit.
-              
+
             </ul>
           
-        
+
         <p>
 
         <li><a name='OOP'></a>
@@ -800,8 +810,8 @@ <h3>Compiling Delphi code using Free Pascal</h3>
 
             <p>The compiler supports Delphi-style classes. Make sure you use the -S2 or
             -Sd command line switches (see the manuals for the meaning of these switches), or add <tt>{$mode objfpc}</tt> or <tt>{$mode delphi}</tt> to your source code. For a
-            list of Delphi incompatibilities also check the manual. 
-                  
+            list of Delphi incompatibilities also check the manual.
+          
 
         <li><a name='HowcanIbuildaunit'></a>
           <h3>Building a unit</h3>
@@ -814,8 +824,8 @@ <h3>Building a unit</h3>
             file, whose precise structure depends on the assembler you used). To use
             this unit in another unit or program, you must include its name in the
             USES clause of your program.
-           
-        
+          
+
 
         <li><a name='CompileSystemUnit'></a>
           <h3>Compiling the system unit</h3>
@@ -824,14 +834,14 @@ <h3>Compiling the system unit</h3>
             <p>To recompile the system unit, it is recommended to have GNU make
             installed. typing 'make' in the rtl source directory will then recompile
             all RTL units including the system unit. You may choose to descend into
-            the directory of your OS (e.g. rtl/linux) and do a 'make' there. 
+            the directory of your OS (e.g. rtl/linux) and do a 'make' there.
             <p>It is possible to do all this manually, but you need more detailed
-            knowledge of the RTL tree structure for that. 
-                  
+            knowledge of the RTL tree structure for that.
+          
 
 
         <li><a name='Howdoesprocedureoverloadingwork'></a>
-          <h3>How does procedure overloading work?</h3>
+          <h3>How does function overloading work?</h3>
 
           
             <p>Here is a procedure overloading example in FPC or ObjFPC mode:
@@ -855,7 +865,7 @@ <h3>How does procedure overloading work?</h3>
             the interface part. If you leave one out, the compiler will complain
             with a 'This overloaded function can't be local' message. Overloaded
             functions must differ in their parameters; it is not enough if only their
-            return types are different. 
+            return types are different.
           
 
         <li><a name='HowToCallCFuncuntions'></a>
@@ -866,10 +876,10 @@ <h3>Calling C functions</h3>
             by the GNU C compiler (<TT>GCC</TT>). E.g., for calling the
             C function strcmp, declare the following (the <tt>cint</tt> type is
             declared in the <tt>ctypes</tt> unit):
-            
+
             <PRE>function strcmp(s1 : pchar;s2 : pchar) : cint;cdecl;external;</PRE>
           
-        
+
 
 
         <li><a name='IntegratedAssemblerSyntax'></a>
@@ -881,7 +891,7 @@ <h3>Integrated Assembler syntax</h3>
             different assembler styles.
 
             <p>A description of the AT&amp;T syntax can be found in the GNU
-            Assembler documentation. 
+            Assembler documentation.
           
 
 
@@ -890,10 +900,10 @@ <h3>Unit system not found errors</h3>
           
             <p>System is Pascal's base unit and is implicitly used by all programs.
             This unit defines several standard procedures and structures, and must be found to
-            be able to compile any Pascal program by FPC. 
+            be able to compile any Pascal program by FPC.
 
             <p>The location of the system and other unit files is passed on to the
-            compiler by the -Fu switch. This switch can be specified on the command line, but is usually located in the fpc.cfg configuration file. 
+            compiler by the -Fu switch. This switch can be specified on the command line, but is usually located in the fpc.cfg configuration file.
 
             <p>If the compiler cannot find this unit, there are three possible causes:
             <OL>
@@ -908,13 +918,13 @@ <h3>Unit system not found errors</h3>
                 versions (this can e.g. happen if you try to use a <A
                 href="#snapshot">snapshot</a>
                 compiler while the -Fu statement in the used fpc.cfg still points to
-                the RTL that came with the official release compiler). 
+                the RTL that came with the official release compiler).
             </OL>
 
             <p>A handy trick can be executing "fpc programname -vtu". This will show
             where the compiler is currently looking for the unit files. You
             might want to pipe this through more (Dos, OS/2, Windows) or less
-            (UNIX), since it can generate more than one screen information: 
+            (UNIX), since it can generate more than one screen information:
 
             <p>
             <PRE>
@@ -923,7 +933,7 @@ <h3>Unit system not found errors</h3>
             </PRE>
             <p>
           
-        
+
         <li><a name='extensionselect'></a>
           <h3>There is a new language extension that would be really useful. Will you include it?</h3>
           
@@ -934,21 +944,21 @@ <h3>There is a new language extension that would be really useful. Will you incl
 	    &quot;worth&quot; the trouble. The most important pre-selection criteria are:
  	    <OL>
 		<li>Compatibility must not be compromised in any way. Existing
-			codebases on at least the Pascal level must keep 
+			codebases on at least the Pascal level must keep
 			running. This is often more difficult than most people
 		        think.
 		<li>The extension must have real value.  Anything that is only
-			a shorter notation does not apply, unless it is 
+			a shorter notation does not apply, unless it is
 			out of compatibility with an existing Pascal/Delphi
 			codebase. Practically it means it must make something
 			possible that cannot be done otherwise or be a compatibility
-			item 
-		<li>The change must fit in with the scope of the project: 
+			item
+		<li>The change must fit in with the scope of the project:
 			implementing a Pascal compiler with support for RAD
 			and a generic DB system. This excludes features like
 			inline SQL, and large garbage collected object frameworks.
-		
-	    </OL>	
+
+	    </OL>
             Exceptions to the second rule are sometimes made for
             platform-specific reasons (e.g. interfacing to some other language or
 	    OS). The first rule is often a problem, because issues are not
@@ -960,14 +970,14 @@ <h3>There is a new language extension that would be really useful. Will you incl
 		<li> how you would implement it?
 		<li> many examples of typical use, and tests for possible problem
 			cases
-	    </ul>	
+	    </ul>
 	    Try to be verbose and really try to view this from the viewpoint
 	    of somebody who has to implement it, and try to make examples
 	    that span multiple units and procedures, and review what happens.
 	    Be critical, try to punch holes in your
 	    own reasoning and find possible problematic cases, and document
-	    them.	
-         
+	    them.
+
         <p>
   	    Besides these pre-selection rules and documentation, the other
 	    important question is who is going to do the work. Keep in mind
@@ -978,7 +988,7 @@ <h3>There is a new language extension that would be really useful. Will you incl
 	    not willing to implement it yourself, submit patches and maintain
 	    it in the future,
 	    chances are slim.  Remarks as &quot;this will attract a lot of
-	    users because...&quot; are considered with a lot of scepsis, since
+	    users because...&quot; are considered with a lot of scepticism, since
 	    that applies to any new development.
 	  
    </OL>
@@ -993,9 +1003,9 @@ <h3>Using the graph unit with Free Pascal</h3>
             <p>Since version 1.0, we  have a completely platform independent way
             of selecting resolutions and bitdepths. You are strongly encouraged to
             use it, because other ways will probably fail on one or other platform.
-            See the documentation of the graph unit for more information. 
+            See the documentation of the graph unit for more information.
           
--->   
+-->
 
         <li><a name=WrongColors></a>
           <h3>Why do I get wrong colours when using the graph unit?</h3>
@@ -1003,20 +1013,20 @@ <h3>Why do I get wrong colours when using the graph unit?</h3>
             <p>If you use <TT>detect</TT> as graphdriver, you will end up with the
             highest supported bitdepth. Since the graph unit currently only supports
             up to 16 bits per pixel modes and since this bitdepth is supported by
-            virtually all graphics cards, you will most likely get a 16 bit mode. 
+            virtually all graphics cards, you will most likely get a 16 bit mode.
 
             <p>The main problem is that in 16 (and 15, 24, 32, ...) bit modes, the
             colors are not set anymore using an index in a palette (the palettized
             way is called &quot;indexed color&quot;). In these modes, the color number itself
             determines what color you get on screen and you can not change this color.
             The color is encoded as follows (for most graphics cards on PC's at
-            least): 
+            least):
 
             <ul>
                 <li>15 bit color: lower 5 bits are blue intensity, next come 5 bits of
                 green and then 5 bits of red. The highest bit of the word is ignored.
                 <li>16 bit color: lower 5 bits are blue intensity, next come *6* bits
-                of green and then 5 bits of red. 
+                of green and then 5 bits of red.
             </ul>
 
             <p>This means that either you have to rewrite your program so it can
@@ -1025,9 +1035,9 @@ <h3>Why do I get wrong colours when using the graph unit?</h3>
             will ensure that you end up with a 256 (indexed) color mode. If there
             are no 256 color modes supported, then graphresult will contain the
             value <TT>GrNotDetected</TT> after you called InitGraph and you can
-            retry with graphdriver <TT>D4BIT</TT>. 
+            retry with graphdriver <TT>D4BIT</TT>.
           
-        
+
 
         <li><a name='fileshare'></a>
            <h3>File sharing and file locks</h3>
@@ -1036,40 +1046,40 @@ <h3>File sharing and file locks</h3>
              files in the default sharing mode of the operating system
              (<TT>system, objects</TT> units). Because of this, you
              might get problems if the file is opened more than once either
-             by another process or the same process. 
+             by another process or the same process.
 
              <p> Generally the behaviors for the different operating
-                 systems are as follows : 
+                 systems are as follows :
              <ul>
-                <li> UNIX systems : There is no verification at all. 
-                <li> Windows : An access denied error will be reported. 
+                <li> UNIX systems : There is no verification at all.
+                <li> Windows : An access denied error will be reported.
 <!--                <li> Amiga : An access denied error will be reported. -->
                 <li> DOS / OS/2 : If the file is opened more than once by
                      the same process, no errors will occur, otherwise an
-                     access denied error will be reported. 
+                     access denied error will be reported.
              </ul>
 
              <p>There are two ways to solve this problem:
              <ul>
                <li> Use specific operating system calls (such as file locking
-                    on UNIX systems) to get the correct behavior. 
+                    on UNIX systems) to get the correct behavior.
                <li> Use the <TT>sysutils</TT> unit or the Free Component Library
                     <TT>TFileStream</TT> File I/O routines, which try
-                    to simulate, as much as possible, file sharing mechanisms. 
+                    to simulate, as much as possible, file sharing mechanisms.
              </ul>
            
-        
+
         <li><a name='filemode'></a>
           <h3>File denied errors when opening files with reset</h3>
           
 
            <p> Trying to open files using <CODE>reset</CODE> on non-text files
-               might cause a Runtime Error 5 (Access denied). 
+               might cause a Runtime Error 5 (Access denied).
 
            <p> All files opened using the above system unit routine use the current
                <CODE>filemode</CODE> value to determine how the file is opened. By
                default, <CODE>filemode</CODE> is set to 2 (Read/Write access).
-            
+
 
             <p>So, a call to <CODE>reset</CODE> on non-text files does <EM>not</EM>
                indicate that the file will be opened read-only. So, trying to open a file
@@ -1077,7 +1087,7 @@ <h3>File denied errors when opening files with reset</h3>
                <CODE>filemode</CODE> should be set to 0 (Real-only access) before
                calling <CODE>reset</CODE> to solve this problem. A sample solution
                is shown below.
-            
+
 
             <PRE>
               const
@@ -1109,22 +1119,22 @@ <h3>File denied errors when opening files with reset</h3>
    <LI><h2>Windows-related information</h2>
    <OL>
 
-        <li><a name=win-release></a>
+        <li><a name='win-release'></a>
           <h3>Releasing software generated by the windows compiler</h3>
           
             <p> There is no special requirements for releasing software
             for the Windows platform, it will work directly out of the box. The following
-            are default for the Windows platform: 
+            are default for the Windows platform:
 
             <ul>
-                <li> Stack size is unlimited 
-                <li> The stack checking option is not available on this platform. 
+                <li> Stack size is unlimited
+                <li> The stack checking option is not available on this platform.
             </ul>
           
-        
+
         <p>
 
-        <li><a name=win-debugging></a>
+        <li><a name='win-debugging'></a>
           <h3>Debugging</h3>
           
             <p>The GNU debugger v6.4 and later have been tested, and generally work as
@@ -1132,11 +1142,11 @@ <h3>Debugging</h3>
             represented as they should. It is suggested to use the text mode IDE instead of GDB,
             which is available for windows targets.
           
-        
+
         <p>
 
 
-        <li><a name=win-dll></a>
+        <li><a name='win-dll'></a>
           <h3>Dynamic libraries</h3>
           
             <p>Creation and use of shared libraries (also called dynamic link libraries) is
@@ -1144,19 +1154,19 @@ <h3>Dynamic libraries</h3>
             more information on shared library creation and use.
           
 
-        
-        
-        <li><a name=win-profile></a>
+
+
+        <li><a name='win-profile'></a>
           <h3>Profiling</h3>
           
-            <p>Profiling is supported using <TT>gprof</TT>. 
-               It requires mingw to be installed, and that <TT>fpc.cfg</TT> points to the 
-               correct library paths. 
+            <p>Profiling is supported using <TT>gprof</TT>.
+               It requires mingw to be installed, and that <TT>fpc.cfg</TT> points to the
+               correct library paths.
            
-        
 
 
-        <li><a name=win-graph></a>
+
+        <li><a name='win-graph'></a>
           <h3>Graph and problems with keyboard, mouse and "dummy dos windows"</h3>
           
             <p>Problem:
@@ -1182,32 +1192,32 @@ <h3>Graph and problems with keyboard, mouse and "dummy dos windows"</h3>
                 <li>Set the application type to GUI: <PRE>{$apptype GUI}</PRE>
                 and put this line before your programs InitGraph statement:
                 <PRE>ShowWindow(GetActiveWindow,0);
-                </PRE>This will hide the dos window window. 
+                </PRE>This will hide the dos window window.
             </ul>
             <p>
 
-            <p>Some of the demos (like fpctris) use these techniques 
+            <p>Some of the demos (like fpctris) use these techniques
           
 
-        <li><a name=win-cygwin></a>
-          <h3>Cygwin binary directory in your path sometimes causes strange problems</h3>
+        <li><a name='win-cygwin'></a>
+          <h3>Cygwin binary directory in your path sometimes causes builds to fail</h3>
           
             <p>The mingw make tool seems to look for a &quot;sh.exe&quot;, which it
 		finds when the cygwin binary directory is in the path. The
 		way directories are searched changes, and the build process dies.
-            
+
 
 	    <p>Solution: do not put cygwin in your global path for now, only
                add it when needed. Efforts are made to work around this.
-	    
 
-            <p>Possible untested workaround: add mingw sh.exe to a directory before 
+
+            <p>Possible untested workaround: add mingw sh.exe to a directory before
                the cygwin binary directory in the path
           
 
-               
 
-        <li><a name=win95-fpc></a>
+
+        <li><a name='win95-fpc'></a>
           <h3>Using the DOS compiler under Windows 95</h3>
           
             <p>There is a problem with the DOS (GO32V2) compiler and Windows 95 on
@@ -1217,10 +1227,10 @@ <h3>Using the DOS compiler under Windows 95</h3>
             some time). If this works you will be able to get the compiler to work
             by recompiling it with a smaller heap size, perhaps 2 or 4 MB
             (option -Chxxxx).
-           
-        
+          
+
 <!--
-        <li><a name=win-os2></a>
+        <li><a name='win-os2'></a>
           <h3>Using OS/2 generated applications under Windows</h3>
           
             <p>Normally OS/2 applications (including the compiler) created with version 1.0.x
@@ -1231,21 +1241,25 @@ <h3>Using OS/2 generated applications under Windows</h3>
             NT / 2000 / XP systems though. This seems to be a problem with EMX (RSX) itself.
             It is not recommended to use Free Pascal OS/2 compiled programs under NT / 2000
             and XP, as it might produce unexpected results.
-                  
+          
 -->
-        <li><a name=win-dos></a>
+        <li><a name='win-dos'></a>
           <h3>Using DOS generated applications under windows</h3>
           
             <p>Several problems have been found running DOS software
-            under certain versions of Windows (NT / 2000 / XP). These
+            under certain versions of 32-bit MS Windows (NT / 2000 / XP). These
             seem to be problems with the DOS emulation layers (emulated
             DPMI services or the Go32 extender). These problems may not occur with all software
             generated by FPC. Either applications should be tested on these systems
-            before being released, or Windows versions should be generated instead.
+            before being released, or Windows versions should be generated instead. Note that no
+            DOS applications may be used under 64-bit versions of MS Windows - this is a general
+            restriction due to DOS emulation not being provided for these MS Windows versions.
+            You might be able to use these applications under DosBox emulation, but it is not
+            officially supported / tested by the FPC team.
           
 
 
-    <li><a name=win-ide-mouse></a>
+    <li><a name='win-ide-mouse'></a>
          <h3>The mouse cursor does not respond in the Windows IDE</h3>
          
 		   <p>In windowed mode, the IDE might not respond to
@@ -1254,47 +1268,50 @@ <h3>The mouse cursor does not respond in the Windows IDE</h3>
 		   response problems.
          
 
-    
+
 
 
    </OL>
+   
    <LI><h2>UNIX-related information </h2>
 
         <p>This section also applies to most UNIX variants, such as
         Linux, FreeBSD and Mac OS X.
+    
 
+    
    <OL>
-        <li><a name=unix-release></a>
+        <li><a name='unix-release'></a>
             <h3>Releasing software generated by the UNIX compilers</h3>
 
             <ul>
-                <li> There is no stack space usage limit. 
-                <li> Stack checking is simulated. 
+                <li> There is no stack space usage limit.
+                <li> Stack checking is simulated.
                 <li> Minimal operating system versions :
                   <ul>
-                    <li> Linux : Kernel v2.4.x or later. 
+                    <li> Linux : Kernel v2.4.x or later.
                     <li> FreeBSD : version 5.x or later.   (4.x can be made to work with minor work)
-                    <li> NetBSD : version 1.5 or later. 
+                    <li> NetBSD : version 1.5 or later.
                     <li> Solaris : version 5.7 of SunOS or later
-                         (should work with earlier versions, but untested). 
+                         (should work with earlier versions, but untested).
                     <li> Mac OS X : version 10.4 or later (Intel), or 10.3.9 or later (PowerPC)
                   </ul>
-                
+
             </ul>
 
-        
+
         <p>
 
-        <li><a name=unix-debugging></a>
+        <li><a name='unix-debugging'></a>
             <h3>Debugging</h3>
 
             <p>The GNU debugger v6.5 and later have been tested, and generally work as
             they should. Because the GNU debugger is C oriented, some pascal types might not be represented as they should.
-        
+
         <p>
 
 
-        <li><a name=unix-dll></a>
+        <li><a name='unix-dll'></a>
             <h3> Dynamic libraries </h3>
 
             <p>Creating dynamic libraries under UNIX-like operating systems is supported.
@@ -1302,29 +1319,29 @@ <h3> Dynamic libraries </h3>
             <p>
                Importing code from shared libraries does work as expected though, since
                it does not require usage of position independant code.
-            
 
-        
-        
-        <li><a name=unix-profile></a>
+
+
+
+        <li><a name='unix-profile'></a>
             <h3>Profiling</h3>
-            
+
             <p>Profiling is supported using <TT>gprof</TT> under linux,
                FreeBSD and NetBSD, the latter two only since 1.0.8. On other
                other UNIX-like operating systems, profiling is currently not
                supported.
-            
-        
-        <li><a name=libci386></a>
+
+
+        <li><a name='libci386'></a>
             <h3>Libc is missing on platforms other than Linux/i386</h3>
             <P>Libc is a Kylix compatibility unit. Because it contains many
-            i386 specific code and features structures from legacy kernels, 
+            i386 specific code and features structures from legacy kernels,
 			it has not been made available on other platforms.
 
             <P>To access UNIX functionality, please use units like baseunix
             and unix.
 
-        <li><a name=vgamissing></a>
+        <li><a name='vgamissing'></a>
             <h3>Why can't the linker find &quot;vga&quot;?</h3>
 
             <p>This error typically looks like this:<PRE>
@@ -1342,45 +1359,52 @@ <h3>Why can't the linker find &quot;vga&quot;?</h3>
 
             <p>This error is not an error in the installation of FPC or FPC itself,
             but a missing Svgalib library in your UNIX install. Please install the
-            required library using your favourite package manager tool 
-        
+            required library using your favourite package manager tool
+
 
 
-        <li><a name=unix-asldmissing></a>
+        <li><a name='unix-asldmissing'></a>
             <h3>Compiler indicates missing as and ld</h3>
 
             <p> Normally UNIX systems have the assembler (<TT>as</TT>) and linker
             (<TT>ld</TT>) pre-installed and already in the search path. That is
-            the reason why these tools are not supplied with the compiler. 
+            the reason why these tools are not supplied with the compiler.
 
             <p>If the compiler cannot find these tools, either they are not in
             your search path, or they are not installed. You should either add the
             path where the tools are located to your search path, and / or you
-            should install these tools. 
+            should install these tools.
 
-        <li><a name=unix-ld219></a>
-            <h3>An error occurred while linking, or &quot;did you forget -T?&quot;</h3>
+        <li><a name='unix-ld219'></a>
+            <h3>link.res syntax error, or &quot;did you forget -T?&quot;</h3>
 
-            <p>There is a bug in GNU LD 2.19 and 2.19.1 that causes it to crash
-            when processing FPC-generated linker scripts. This bug has been fixed
-            in the mean time.</p>
+            <p>There was a bug in GNU LD 2.19 that caused it to crash
+            when processing FPC-generated linker scripts. This bug has been fixed in
+            GNU LD 2.19.1.</p>
 
-            <p>At the same time, LD has been modified to emit a warning of the form 
+            <p>At the same time, LD has been modified to emit a warning of the form
             <pre>
                /usr/bin/ld: warning: link.res contains output sections; did you forget -T?
             </pre></p>
 
-            <p>This warning is benign, and FPC intentionally does not pass -T to LD. The reason
-            is that if -T is used, LD's internal linker script is ignored and only
-            FPC's linker script is used. Such linker scripts also contain paths to
-            libraries however, and if we would ignore the internal linker script then
-            LD would no longer find libraries in distribution-specific directories.</p>
+            <p>FPC 3.1.1 and later by default generate a different kind of linker script
+            that no longer triggers this warning. Unfortunately, this is only possible by
+            making use of functionality that is unavailable before GNU LD 2.19. Earlier
+            versions therefore now complain about a syntax error in link.res. The new
+            <tt>-X9</tt> compiler command line parameter can, however, be used to
+            generate linker scripts that are compatible with pre-2.19 linker versions.
+            </p><p>
+            Their is no way to remove the <tt>-T</tt> warning with earlier FPC versions, but it
+            should not result in any problems.
+            </p>
 
    </OL>
+   
    <LI><h2>OS/2-related information </h2>
+   
    <OL>
 
-       <li><a name=os2-release></a>
+       <li><a name='os2-release'></a>
             <h3>Releasing software generated by the OS/2 compiler</h3>
 
              <p> The OS/2 compiler version 1.0.x and before is based on EMX, therefore
@@ -1399,23 +1423,23 @@ <h3>Releasing software generated by the OS/2 compiler</h3>
                      with an error 'Cannot find EMX.dll'.
                 <li> Stack can grow up to 256 Kbytes by default. This can be changed by
                      the user or developper using the <TT>emxstack</TT> or <TT>emxbind</TT>
-                     utilities. 
+                     utilities.
             </ul>
-        
+
         <p>
 
 
-        <li><a name=os2-debugging></a>
+        <li><a name='os2-debugging'></a>
             <h3>Debugging</h3>
 
             <p>The GNU debugger v4.16 (EMX port) has been tested (including
             its PM add-on, pmgdb.exe) and generally works as it should.
             Because the GNU debugger is C oriented, some pascal types
             might not be represented correctly.
-        
+
         <p>
 
-        <li><a name=os2-dll></a>
+        <li><a name='os2-dll'></a>
             <h3> Dynamic libraries </h3>
 
             <p>
@@ -1423,31 +1447,35 @@ <h3> Dynamic libraries </h3>
             shared libraries (also called dynamic link libraries), the compiler
             currently only permits importing routines from dynamic libraries (creation of
             dynamic libraries is unsupported).
-            
 
-        
-        
-        <li><a name=os2-profile></a>
+
+
+
+        <li><a name='os2-profile'></a>
             <h3>Profiling</h3>
-            
-            <p>Profiling is currently not supported for this platform. 
-        
 
+            <p>Profiling is currently not supported for this platform.
 
-        <li><a name=os2-dos></a>
+
+
+        <li><a name='os2-dos'></a>
             <h3>Using DOS generated applications under OS/2</h3>
 
             <p>It has been reported that some DOS (GO32V2) applications
             (including the DOS compiler itself) generated by the compiler fail on
             some OS/2 installations. This is due to problems in the OS/2 DPMI server.
-            
+
 
             <p>You should use native OS/2 applications under OS/2 (including the native OS/2
             compiler) or try installing a new OS/2 fixpack to see if it solves the
-            problem. 
-        
+            problem.
+
+
+        <li><a name="instal106os2"></a><h3>INSTALL.EXE of version 1.0.6 or below fails with an unknown error (-1) under OS/2</h3>
+            <p>
+            or
 
-        <li><a name="instal106os2"></a><h3>INSTALL.EXE complains about a missing TZ variable under OS/2</h3>
+            <h3>INSTALL.EXE of version 1.0.6 or above complains about missing TZ variable under OS/2</h3>
 
             <p>
             You are most probably using an older version of OS/2 (like OS/2 Warp 3.0)
@@ -1457,8 +1485,8 @@ <h3>Using DOS generated applications under OS/2</h3>
             The proper setting for you can be found e.g. using the TZCALC tool from
             <a href="http://hobbes.nmsu.edu/pub/os2/apps/internet/time/time868f.zip">TIME868</a>
             package.
-            
-        
+
+
         <li><a name="os2-fp"></a><h3>OS/2 compiler not working after upgrading to 1.9.6 or newer</h3>
             <p>An updated version of GNU assembler (as.exe) is packaged with release 1.9.6 (newer version
             was necessary to get support for features of modern CPUs). This version of the GNU tool
@@ -1466,7 +1494,7 @@ <h3>Using DOS generated applications under OS/2</h3>
             limitations regarding supported configurations, because this libc needs recent version
             of OS/2 Unicode support libraries (LIBUNI.DLL and UCONV.DLL) not available in base OS/2 Warp 3.0
             and OS/2 Warp 4.0. The updated versions were distributed by IBM in corrective packages (fixpaks)
-            - see e.g. <a href="http://www.warpupdates.mynetcologne.de/english/basesystem.html">WarpUpdates site</a>
+            - see e.g. <a href="http://web.archive.org/web/20080103002005/http://www.warpupdates.mynetcologne.de/english/basesystem.html">WarpUpdates site</a>
             for information about OS/2 fixpaks and links for downloading them.
             This issue isn't valid for WarpServer for e-Business, MCP and eComStation - these already have
             the correct version.
@@ -1486,37 +1514,37 @@ <h3>Using DOS generated applications under OS/2</h3>
             library or other details about the problem.
 
    </OL>
+   
 
    <LI><h2>BeOS-related information </h2>
+   
    <OL>
-
-
-          <li><a name=beos-release></a>
+          <li><a name='beos-release'></a>
                <h3>Releasing software generated by the BeOS compiler</h3>
 
                 <p> Software generated for the BeOS target will only work
-                on the Intel based version of BeOS. 
+                on the Intel based version of BeOS.
 
                 <ul>
                     <li> The target system must have at least BeOS v4.0 or later
-                       (BeOS 5.1d 'Dano' is <em>not</em> supported) 
-                    <li> Stack size is set to 256 Kbytes. This cannot be changed 
+                       (BeOS 5.1d 'Dano' is <em>not</em> supported)
+                    <li> Stack size is set to 256 Kbytes. This cannot be changed
                </ul>
-           
+
            <p>
 
 
-        <li><a name=beos-debugging></a>
+        <li><a name='beos-debugging'></a>
             <h3>Debugging</h3>
 
             <p>
             Debugging works with the system-supplied gdb version.
-            
 
-        
+
+
         <p>
 
-        <li><a name=beos-dll></a>
+        <li><a name='beos-dll'></a>
             <h3> Dynamic libraries </h3>
 
             <p>
@@ -1524,42 +1552,45 @@ <h3> Dynamic libraries </h3>
             shared libraries (also called dynamic link libraries), the compiler
             currently only permits importing routines from dynamic libraries (creation of
             dynamic libraries is unsupported).
-            
 
-        
-        
-        <li><a name=beos-profile></a>
+
+
+
+        <li><a name='beos-profile'></a>
             <h3>Profiling</h3>
-            
-            <p>Profiling is currently not supported for this platform. 
-        
-        
-        
-          <li><a name=beos-linking></a>
+
+            <p>Profiling is currently not supported for this platform.
+
+
+
+          <li><a name='beos-linking'></a>
                <h3>BeOS Linking problems</h3>
 
                 <p>It has been reported that certain versions of the linker
-                that shipped with some versions of BeOS are broken. If you get 
-                an error when linking fpc applications, try updating your version 
+                that shipped with some versions of BeOS are broken. If you get
+                an error when linking fpc applications, try updating your version
                 of ld from the following
                 <a href="http://open-beos.sourceforge.net/dev.php">site.</a>
-                
 
-           
+
+
            <p>
-        
-        
+
+
 
 
    </OL>
+   
+
 <!--
    <LI><h2>Amiga-related information </h2>
+   
    <OL>
-         <li><a name=amiga-release></a>
+         <li><a name='amiga-release'></a>
                <h3>Releasing software generated by the Amiga compiler</h3>
 
                 <ul>
-                    <li> The target system must have AmigaOS v2.04 or higher 
+                    <li> The target system must have AmigaOS v2.04 or higher
                     <li> Stack size is not set by the compiler, but by the <TT>stack</TT>
                          command on the CLI. Because of this, and because default
                          stack sizes for this target are small, it is recommended
@@ -1570,27 +1601,27 @@ <h3>Releasing software generated by the Amiga compiler</h3>
                          is used, and there is no runtime checking. It is up
                          to you to implement CPU verification at program startup. The
                          standard runtime libraries have been compiled for the
-                         68000 target, and should not cause any problems. 
+                         68000 target, and should not cause any problems.
                     <li> All floating point operations are simulated,
                          and use the <TT>single</TT> floating point type.
                          You will need to recompile all standard runtime
                          libraries and your application, with the software floating point
                          option off, if you wish to use hardware floating point.
                </ul>
-         
+
          <p>
 
-        <li><a name=amiga-debugging></a>
+        <li><a name='amiga-debugging'></a>
             <h3>Debugging</h3>
 
             <p> Source level debugging is not supported for the Amiga target. Assembler
             target debugging is possible though, using the excellent <TT>Barfly</TT>
             debugger.
 
-        
+
         <p>
 
-        <li><a name=amiga-dll></a>
+        <li><a name='amiga-dll'></a>
             <h3> Dynamic libraries </h3>
 
             <p>
@@ -1598,45 +1629,49 @@ <h3> Dynamic libraries </h3>
             shared libraries (also called dynamic link libraries), the compiler
             does not support either the importing or creation of shared libraries.
             Importing must be done manually in assembler.
-            
 
-        
-        
-        <li><a name=amiga-profile></a>
+
+
+
+        <li><a name='amiga-profile'></a>
             <h3>Profiling</h3>
-            
-            <p>Profiling is currently not supported for this platform. 
-        
-        
+
+            <p>Profiling is currently not supported for this platform.
+
+
 
    </OL>
+   
 
    <LI><h2>PalmOS-related information </h2>
+
+   
    <OL>
 
-          <li><a name=palmos-release></a>
+          <li><a name='palmos-release'></a>
             <h3>Releasing software generated by the PalmOS compiler</h3>
 
             <ul>
             </ul>
 
-          
+
           <p>
 
-        <li><a name=palmos-debugging></a>
+        <li><a name='palmos-debugging'></a>
             <h3>Debugging</h3>
 
-        <li><a name=palmos-dll></a>
+        <li><a name='palmos-dll'></a>
             <h3> Dynamic libraries </h3>
 
             <p>
         <p>
    </OL>
+   
 -->
    <LI><h2>DOS-related information</h2>
    <OL>
 
-        <li><a name=dos-release></a>
+        <li><a name='dos-release'></a>
           <h3>Releasing software generated by the DOS compiler</h3>
           
             <ul>
@@ -1644,21 +1679,21 @@ <h3>Releasing software generated by the DOS compiler</h3>
                 very probable), make sure to read "<a href="#fp386">Applications created
                 with Free Pascal crash on 80386 systems</a>" regarding special issues
                 which might occur. Math coprocessor emulation software is then
-                required (<TT>wmemu387.dxe</TT> should be redistributed with your software) 
+                required (<TT>wmemu387.dxe</TT> should be redistributed with your software)
                 <li> The target system must have a DPMI server. To avoid problems,
                      the file <TT>cwsdpmi.exe</TT> should always be redistributed with your
                      application
-                <li> The target system must have DOS 3.3 or later 
+                <li> The target system must have DOS 3.3 or later
                 <li> The default stack size is 256 Kbytes. See also "<a href="#dos-stack">Changing
-                      the default stack size</a>" 
-                <li> The stack checking option is available on this platform. 
+                      the default stack size</a>"
+                <li> The stack checking option is available on this platform.
             </ul>
           
 
-        
+
         <p>
 
-        <li><a name=dos-debugging></a>
+        <li><a name='dos-debugging'></a>
           <h3>Debugging</h3>
           
             <p>The GNU debugger v4.16 and later have been tested, and generally work as
@@ -1666,31 +1701,31 @@ <h3>Debugging</h3>
             represented as they should. It is suggested to use the text mode IDE instead of GDB,
             which is available for the DOS target.
           
-        
+
         <p>
 
-        <li><a name=dos-dll></a>
-          <h3>Dynamic Libraries</h3>
+        <li><a name='dos-dll'></a>
+          <h3>Dynamic libraries</h3>
           
             <p>Creation or use of shared libraries (also called dynamic link libraries) is not
                supported under this platform.
-            
+          
 
-        
-        
-        <li><a name=dos-profile></a>
+
+
+        <li><a name='dos-profile'></a>
           <h3>Profiling</h3>
-            
-            <p>Profiling with <TT>gprof</TT> is supported for this platform. 
           
-        
+            <p>Profiling with <TT>gprof</TT> is supported for this platform.
+          
+
 
 
-        <li><a name=FPwithoutfpu></a>
-          <h3>Running Free Pascal without a math coprocessor?</h3>
+        <li><a name='FPwithoutfpu'></a>
+          <h3>Running Free Pascal without a math coprocessor</h3>
           
             <p>On the Intel version the emulator is automatically loaded by the
-            compiler if you add the following commands to your autoexec.bat: 
+            compiler if you add the following commands to your autoexec.bat:
 
             <p><PRE>
                     SET 387=N
@@ -1698,9 +1733,9 @@ <h3>Running Free Pascal without a math coprocessor?</h3>
             </PRE>(do not forget to replace the <TT>C:\PP</TT> with the directory
             where you installed FPC)
           
-        
 
-        <li><a name=fp386></a>
+
+        <li><a name='fp386'></a>
           <h3>Applications created with Free Pascal crash on 80386 systems</h3>
           
             <ul>
@@ -1714,7 +1749,7 @@ <h3>Applications created with Free Pascal crash on 80386 systems</h3>
                         program myprog;
                         uses emu387, ...
                 </PRE>
-                
+
 
 
                 <p>When the application is released, the software package should also
@@ -1730,10 +1765,10 @@ <h3>Applications created with Free Pascal crash on 80386 systems</h3>
             </ul>
           
         <p>
-        
 
 
-        <li><a name=nomousegraph></a>
+
+        <li><a name='nomousegraph'></a>
           <h3>The mouse cursor is not visible in graphics screens</h3>
           
 
@@ -1742,7 +1777,7 @@ <h3>The mouse cursor is not visible in graphics screens</h3>
             href="ftp://ftp.logitech.com/pub/techsupport/mouse/m643&nbsp;w31.exe">here</a>
          
 
-        <li><a name=accessioports></a>
+        <li><a name='accessioports'></a>
           <h3>Accessing I/O ports</h3>
           
             <p>The Port array is supported like in TP, as long
@@ -1750,18 +1785,18 @@ <h3>Accessing I/O ports</h3>
 
             <p>I/O port access is possible under Linux, but that requires root
             privileges. Check the manuals for the IOPerm, ReadPort and WritePort
-            procedures. (Unit Linux) 
+            procedures. (Unit Linux)
           
-        
 
-        <li><a name=HowToAccessDosMemory></a>
+
+        <li><a name='HowToAccessDosMemory'></a>
           <h3>Accessing DOS memory / Doing graphics programming</h3>
           
             <p>You can do like in Turbo Pascal, via absolute or mem[]. For larger memory
-            blocks use the dosmemput/dosmemget routines in the <TT>Go32</TT> unit. 
-                  
+            blocks use the dosmemput/dosmemget routines in the <TT>Go32</TT> unit.
+          
 
-        <li><a name=dos-stack></a>
+        <li><a name='dos-stack'></a>
           <h3>Changing the default stack size</h3>
           
             <p>Under the DOS (GO32V2) target, the default stack size to 256 bKbytes. This can
@@ -1773,7 +1808,7 @@ <h3>Changing the default stack size</h3>
         <p>
 
 <!--
-        <li><a name=dos-os2></a>
+        <li><a name='dos-os2'></a>
           <h3>Using OS/2 generated applications under DOS</h3>
           
             <p>OS/2 applications (including the compiler) created with version 1.0.x
diff --git a/install/doc/faq.txt b/install/doc/faq.txt
index 881ce58d..707c7963 100644
--- a/install/doc/faq.txt
+++ b/install/doc/faq.txt
@@ -45,7 +45,7 @@ library calls, consult the Free Pascal manuals. Topics covered in this document
     10. There is a new language extension that would be really useful. Will you
         include it?
  3. Runtime library related information
-     1. Why do I get wrong colors when using the graph unit?
+     1. Why do I get wrong colours when using the graph unit?
      2. File sharing and file locks
      3. File denied errors when opening files with reset
  4. Windows-related information
@@ -66,14 +66,18 @@ library calls, consult the Free Pascal manuals. Topics covered in this document
      5. Libc is missing on platforms other than i386
      6. Why can't the linker find "vga"?
      7. Compiler indicates missing as and ld
-     8. An error occurred while linking, or "did you forget -T?"
+     8. link.res syntax error, or "did you forget -T?"
  6. OS/2-related information
      1. Releasing software generated by the OS/2 compiler
      2. Debugging
      3. Dynamic libraries
      4. Profiling
      5. Using DOS generated applications under OS/2
-     6. INSTALL.EXE complains about a missing TZ variable under OS/2
+     6. INSTALL.EXE of version 1.0.6 or below returns an unknown error (-1)
+        under OS/2
+        or
+        INSTALL.EXE of version 1.0.6 or above complains about missing TZ
+        variable under OS/2
      7. OS/2 compiler not working after upgrading to 1.9.6 or newer
      8. Compilation under OS/2 fails with error "Can't call the assembler"
  7. DOS-related information
@@ -92,14 +96,14 @@ library calls, consult the Free Pascal manuals. Topics covered in this document
 
      1. What is Free Pascal (FPC)?
 
-        Originally named FPK-Pascal, the Free Pascal compiler is a 16,32 and 64
-        bit Turbo Pascal and Delphi compatible Pascal compiler for Linux,
+        Originally named FPK-Pascal, the Free Pascal compiler is a 16, 32 and
+        64 bit Turbo Pascal and Delphi compatible Pascal compiler for Linux,
         Windows, OS/2, FreeBSD, Mac OS X, DOS and several other platforms (the
         number of supported targets grows all the time, although not all of
         them are on the same level as the main ones).
 
         The Free Pascal compiler is available for several architectures: x86
-        (16,32 and 64 bit), ARM, PowerPC (32 and 64 bit), SPARC (v8, v9), Java
+        (16, 32 and 64 bit), ARM, PowerPC (32 and 64 bit), SPARC (v8, v9), Java
         Virtual Machine (under development) and MIPS (little and big endian,
         under development). An older version (the 1.0 series) and current
         development versions also supported m68k.
@@ -129,15 +133,16 @@ library calls, consult the Free Pascal manuals. Topics covered in this document
           ☆ 01/2012: 2.6.0 released
           ☆ 02/2013: 2.6.2 released
           ☆ 03/2014: 2.6.4 released
-          ☆ 01/2015: 3.0.0 released
-          ☆ 02/2017: 3.0.2 released 
+          ☆ 11/2015: 3.0.0 released
+          ☆ 02/2017: 3.0.2 released
           ☆ 11/2017: 3.0.4 released
-          ☆ 04/2020: 3.2.0 released
+          ☆ 06/2020: 3.2.0 released
+          ☆ 05/2021: 3.2.2 released
      2. Which versions exist, and which one should I use?
 
-        The latest official version is 3.2.0, the first release in the 3.2.x
-        series. New development is performed in the 3.3.x series, which will
-        eventually be released as 3.4.0 or 4.0.0, depending on milestones
+        The latest official version is 3.2.2, the first minor update in the
+        3.2.x series. New development is performed in the 3.3.x series, which
+        will eventually be released as 3.4.0 or 4.0.0, depending on milestones
         achieved.
 
         Historic versions
@@ -163,11 +168,14 @@ library calls, consult the Free Pascal manuals. Topics covered in this document
           ☆ Repackagings that affect sources are indicated with a single letter
             as suffix (e.g. 2.0.4a). This is usually the case for platforms
             that weren't part of the original release round.
-          ☆ The stable branch (currently fixes_3_2, previously fixes_3_0)
-            always has an odd last number (3.0.1, 3.0.3 and 3.2.1). Compilers
-            with such versions are snapshots, and e.g. a snapshot with 3.0.3
-            can be anywhere between 3.0.2 and the moment 3.0.4 branched off.
-            After 3.2.0, the stable branch's number was updated to 3.2.1 etc.
+          ☆ The stable branch (currently, fixes_3_0, previously fixes_2_6)
+            always has an odd last number (2.6.1, 2.6.3 and 3.0.1). Compilers
+            with such versions are snapshots, and e.g. a snapshot with 2.6.1
+            can be anywhere between 2.6.0 and the moment 2.6.2 branched off
+            (Jan 2013). Likewise, after the release of 2.6.2 the fixes_2_6
+            branch identified itself as version 2.6.3 till 2.6.4 branched off
+            (typically two months before its release). After 2.6.4, the stable
+            branch's number was updated to 2.6.5, after 3.0.2 to 3.0.3 etc.
 
         Normally, you would want to use a release. Releases are considered
         stable, and easier to support (the bugs, quirks and unintended
@@ -199,1004 +207,1199 @@ library calls, consult the Free Pascal manuals. Topics covered in this document
             Free Pascal tries to implement a Borland compatible pascal compiler
             on as many platforms as possible. GNU Pascal tries to implement a
             portable pascal compiler based on POSIX.
-        Version:
-            Currently, Free Pascal is at version 3.2.0 (April 2020). GNU
-            Pascal is stopped version 2.1 (from 2002, which can be built with
-            several different GCC's as backend; their Mac OS X version is an
-            exception though, as it follows the GCC version number).
-        Tracking:
-            Between releases, development versions of FPC are available through
-            daily snapshots and the source via SVN. GPC issues a set of patches
-            to the last version a few times a year, and there are regular
-            snapshot for OS X and Windows, made by users.
-        Operating systems:
-            Free Pascal runs on a large number of platforms, inlcuding DOS (16/
-            32-bit), Win32 (no UNIX porting layer needed), Linux, FreeBSD,
-            NetBSD, OS/2, BeOS, Mac OS X, on the following architectures: x86
-            (32 and 64 bit), SPARC, PowerPC (32 and 64 bit), ARM, Java Virtual
-            Machine (under development), and MIPS (under development). GNU
-            Pascal runs basically on any system that supported by GCC, and for
-            which the build process was verified.
-        Bootstrapping:
-            FPC requires a suitable set of binutils (AS, AR, LD) on some
-            platforms, GNU make and a command line bootstrap compiler. New
-            architectures/OSes are cross-compiled. GPC bootstraps via a
-            suitable version of GCC, and requires a full set of binutils, flex,
-            bison, gmake, a POSIX shell and libtool
-        Sources:
-            Free Pascal is entirely written in Pascal, while GNU Pascal is
-            written in C (it's an adaptation of the GNU C compiler)
-        Language:
-            Free Pascal supports the Borland Pascal dialect, implements the
-            Delphi Object Pascal language, Objective-Pascal and has some
-            support for ISO 7185 Pascal and Mac Pascal extensions. GNU Pascal
-            supports ISO 7185, ISO 10206 and (most of) Borland Pascal 7.0
-        Extensions:
-            Free Pascal implements method, function and operator overloading
-            (later Delphi versions have also added these, so strictly they are
-            not extensions anymore). GNU Pascal implements operator overloading.
-        License:
-            Both compilers come under the GNU GPL.
-        Author:
-            Free Pascal was started by Florian Klämpfl, Germany
-            (florian@freepascal.org), GNU Pascal was started by Jukka Virtanen,
-            Finland (jtv@hut.fi).
-
-
-     4. License and copyright information
-
-        Applications created by the compiler and using the runtime library
-        (RTL) come under a modified Library GNU Public License (LGPL). This
-        license does not impose any kind of license on the created
-        applications. It is therefore possible to create closed source or
-        proprietary software using the Free Pascal Compiler.
-
-        The following exception has been added to the LGPL variant that applies
-        to the FPC RTL:
-
-        As a special exception, the copyright holders of this library give you
-        permission to link this library with independent modules to produce an
-        executable, regardless of the license terms of these independent
-        modules, and to copy and distribute the resulting executable under
-        terms of your choice, provided that you also meet, for each linked
-        independent module, the terms and conditions of the license of that
-        module. An independent module is a module which is not derived from or
-        based on this library. If you modify this library, you may extend this
-        exception to your version of the library, but you not obligated to do
-        so. If you do not wish to do so, delete this exception statement from
-        your version.
-
-        Please note that you still have to comply to the LGPL as far as sources
-        of the runtime library itself are concerned. This, for example,
-        requires you to provide the source code of the runtime library if a
-        recipient of your application asks for it. If you want to write
-        proprietary closed source software, please comply with the following
-        terms:
-          ☆ Most people can satisfy the source code requirement by mentioning
-            that the RTL source code can be downloaded at the Free Pascal web
-            site: if you did not modify the rtl this is considered adequate to
-            satisfy the LGPL requirement of providing source code.
-          ☆ If you made modifications to the runtime library, you cannot keep
-            them for yourself, you must make them available if requested by
-            recipients of your application.
-          ☆ Distribute the modified LGPL license with your product, indicating
-            to which parts of your application it applies (the FPC RTL).
-
-        The compiler source code, on the other hand, comes under the GNU
-        General Public License, which means that the compiler source can only
-        be used in software projects that are distributed under a compatible
-        license (or that are not distributed at all).
-     5. Getting the compiler
-
-        The latest official stable Free Pascal release is available for
-        download from all official mirrors
-     6. Free Pascal installation hints
-
-          ☆ Do not install the compiler in a directory that has spaces in its
-            name, since some of the compiler tools do not like these
-     7. Why do i have to supply a user name and password to get Free Pascal ?
-
-        You are trying to login to an ftp site. You have to use the login name
-        "anonymous" and your e-mail address as your password.
-     8. Access denied error when connecting to the Free Pascal FTP site
-
-        The Free Pascal main ftp site can only accept a maximum number of
-        simultaneous connections. If this error occurs, it is because this
-        limit has been reached. The solution is either to wait and retry later,
-        or better still use one of the Free Pascal mirror sites.
-     9. I want a new version NOW
-
-        In the time between the release of new official versions, you can have
-        a look at and test developer versions (so-called "snapshots"). Be
-        warned though: this is work in progress, so in addition to old bugs
-        fixed and new features added, this may also contain new bugs.
-
-        Snapshots are generated automatically each night from the current
-        source at that moment. Sometimes this may fail due to bigger changes
-        not yet fully implemented. If your version does not work, try again one
-        or two days later.
-
-        The latest snapshot can always be downloaded from the development web
-        page.
-    10. Installing a snapshot
-
-        To install a snapshot, extract the zip archive into the existing
-        program directory of the last official version of Free Pascal (after
-        making a backup of the original, of course). You can also extract it
-        into an empty directory and then move the files to the program
-        directory, overwriting existing files.
-    11. I have to write a program for homework. Can you help?
-
-        No. Please, don't send us mail about homework, we are no teachers. The
-        Free Pascal development team tries to give good support for the Free
-        Pascal compiler and are trying to always reply to emails. If we get
-        emails like this, this becomes harder and harder.
-    12. How do I make a real Windows application with windows and menu bars?
-
-        The easiest way is to download Lazarus. It won't be just a Windows
-        application, it will also work under Linux, FreeBSD and Mac OS X.
-    13. How do I make a game with Free Pascal? Can I make a game like Doom 3?
-
-        Yes, you can make games with Free Pascal and if you are really good you
-        can make a game like Doom 3. Making games is difficult, you need to be
-        an experienced programmer to make them. The web site
-        www.pascalgamedevelopment.com is a community of people who program
-        games in Free Pascal and Delphi.
-
-        If you want a start, please start to study JEDI-SDL or PTCPas. Also you
-        can try to study an existing game, for example The Sheep Killer is a
-        very simple game and it should not be very hard to understand its code.
-    14. Getting more information when an application crashes
-
-         1. The easiest possibility is to recompile your program with -gl
-            debugging option. This way unit LineInfo is automatically linked
-            in, and the printout after a program crash then contains source
-            line numbers in addition to addresses of the crash. To see runtime
-            library (RTL) functions in the backtrace with their real name, you
-            have to recompile the RTL with -gl too.
-         2. For more comprehensive checking, compile the program with debugging
-            information (use the -g command line option)
-         3. Load the program in the debugger
-
-            gdb --directory=<src dirs> myprog.exe
-
-            Notes:
-              ○ Under UNIX systems (Linux, the BSD's), don't add the ".exe"
-                after myprog
-              ○ "src dirs" is a list of directories containing the source code
-                files of myprog and the units it uses seperated by semi-colons
-                (";") on Windows, or colons (":") on UNIX platforms. The
-                current directory is automatically included.
-         4. Once inside the debugger, you can (optionally) set the command line
-            options that will be passed to your program using the command "set
-            args <option1 option2 ...>"
-         5. To start the program, type "run" and press enter
-         6. After the program has crashed, the address of the instruction where
-            the crash occurred will be shown. The debugger will try to display
-            the source code line corresponding with this address. Note that
-            this can be inside a procedure of the RTL, so the source may not
-            always be available and most likely the RTL wasn't compiled with
-            debugging information.
-         7. If you then type "bt" (BackTrace), the addreses on the call stack
-            will be shown (the addresses of the procedures which were called
-            before the program got to the current address). You can see which
-            source code lines these present using the command
-
-            info line *<address>
-
-            For example:
-
-            info line *0x05bd8
-
-    15. Compiler seems to skip files in directories that -Fu points to
-
-        This sometimes happens with installation/compilation scripts if the
-        copying command doesn't preserve dates. The object files get older than
-        the PPU file, and the compiler tries to recompile them. A simple touch
-        will solve it.
-
-        Also note that FPC, contrary to Turbo Pascal keeps track of include
-        files. Modified include files or duplicate names can trigger an attempt
-        to recompile.
-    16. Why are the generated binaries so big?
-
-        There are several reasons and remedies for this:
-         1. You can create smartlinked applications. To turn on the generation
-            of smartlinkable units, use the -CX command line option when
-            compiling your units. To turn on the linking of previously
-            generated smarlinkable units, use the -XX command line option when
-            compiling a program.
-         2. Normally, all symbol information is included in the resulting
-            program (for easier debugging). You can remove this by using the
-            -Xs command line option when compiling your program (it will not do
-            anything when compiling units)
-         3. Turn on optimisations, both for supplied packages (RTL, FV, FCL)
-            and for your own code, this will also decrease the code size.
-        Generally Free Pascal generates smaller binaries than modern competing
-        compilers, however, it does not hide code in large dynamic libraries.
-        Free Pascal generates larger binaries than compilers from long ago do.
-        Large framework libraries result in larger executables. See also the
-        Size Matters wiki entry.
-    17. Runtime errors
-
-        When an application generated by FPC terminates in an abnormal way, it
-        is very likely that a runtime error will be generated. These errors
-        have the form :
-
-                    Runtime error 201 at $00010F86
-                      $00010F86  main,  line 7 of testr.pas
-                      $0000206D
-
-
-        The 201 in this case indicates the runtime error number. The definition
-        of the different runtime error numbers is described in the Free Pascal
-        user's manual, Appendix D. The hexadecimal numbers represent the
-        addresses on the call stack when the error occured.
-    18. Standard units
-
-        To see the list of base units supplied with Free Pascal, and on which
-        platform they are supported, consult the Free Pascal user's manual.
-        There is also a short description of what each unit does in the same
-        section of the manual.
-    19. Debugging smartlinked code does not fully work
-
-        Debugging smart linked code might not work correctly. This is due to
-        the fact that no type information is emitted for smartlinked code. If
-        this would not be done, the files would become enormous.
-
-        While debugging, it is not recommended to use the smartlinking option.
-    20. Cannot compile a program using a binary-only version of a unit
-
-        Sometimes, even though there is a binary version of a module (unit file
-        and object file) available, the compiler claims it cannot find the unit
-        This can be caused either by an incompatibility in the PPU file format
-        (which can change across compiler versions), or by a change in one of
-        the units of the RTL that has changed in between releases.
-
-        To get more information, compile the code using the -vtu (show tried
-        and used unit information) compiler switch, and the unit loading phase
-        will be displayed. You might discover that the unit being loaded
-        requires to be recompiled because one of the unit it uses has changed.
-
-        If you plan on distributing a module without the source code, the
-        binaries should be compiled and made available for all versions of the
-        compiler you wish to support, otherwise compilation errors are bound to
-        occur.
-    21. Will you support ISO Extended Pascal?
-
-        FPC's primary goal is to be a Turbo Pascal and Delphi-compatible
-        compiler, and it also supports a subset of the Mac-Pascal dialect and
-        of Standard ISO Pascal. While in theory it would be possible to add a
-        complete ISO Standard or Extended Pascal modes, until now no people
-        interested in such functionality have stepped up to work on such
-        features.
-
-        GNU-Pascal is however a modern compiler that can compile ISO Extended
-        Pascal. If you have any need for the ISO Extended Pascal dialect, we
-        recommend you to take a look at this compiler.
-    22. What about .NET?
-
-        Occasionally, users ask about a FPC that supports .NET, or our plans in
-        that direction.
-
-        Mainly the users are either interested because of .NET's portability
-        aspects (Mono is quoted over and over again), or because it is supposed
-        to be the next big thing in Windows programming, and they think Windows
-        programming will not be possible in the future.
-
-        While the FPC core developpers are somewhat interested out of academic
-        curiousity (mainly because it could be a pilot for a generalized
-        backend creating bytecode) there are however several problems with .NET
-        in combination with FPC:
-         1. Pascal is a language that uses pointers, and existing codebases can
-            only be unmanaged. Unmanaged code is not portable under .NET, so
-            that already kills most possible benefits. This also means that
-            existing FPC and Delphi code won't run on .NET. There are more such
-            little language problems.
-         2. FPC's libraries are not based on .NET classes and data models (and
-            cannot be changed to do so without effectively rewriting them),
-            moreover the libraries could only be unmanaged too, or they would
-            be incompatible
-         3. There is nothing practical known yet about how portable an average
-            .NET program will be. Little experiments with hello world level
-            code mean nothing, that kind of code works with nearly any
-            language. A good test would be to see existing non trivial
-            codebases run unmodified under mono, that were not designed with
-            mono in mind. Just like we try to do for Delphi
-         4. The fact that on Windows 80% of the .NET code seems to be ASP.NET
-            does not help either. This makes porting existing code less useful
-            (since ASP.NET is tied to IIS), and new codebases of portable code
-            can be set in nearly every language
-         5. Operating System dependant code would not work anymore, since the
-            Win32/64 interface is unmanaged.
-
-        So effectively this means that for FPC to benefit from .NET you would
-        have to significantly adapt the language (thus compiler) and libraries,
-        and be incompatible with the existing native sourcecode. Moreover that
-        also means that existing apps would have to be rewritten for .NET,
-        since it would take more than a simple recompile with a FPC/.NET
-        compiler.
-
-        While unmanaged code has some uses (easier integration with managed
-        code inside Windows), this still requires writing a code generator and
-        defining interfaces and libraries. This means a lot of work and since
-        .NET take-up is not really high, this might not be worth it.
-
-        However if a FPC user does the bulk of the work (e.g. a bytecode
-        codegenerator, and maybe some base libraries) and if the work is
-        suitable for inclusion in FPC (a very big if), we will of course
-        include it.
-
-        Since support for generating JVM bytecode has been added to the
-        compiler, such a project may be more realistic now than it has been in
-        the past. Many of the caveats mentioned above still hold though:
-        language compatibility is not 100% and most standard units will have to
-        be reimplemented.
-
- 2. Pascal language related information
-
-     1. Considerations in porting to other processors
-
-        Because the compiler supports multiple processor architectures, it is
-        important to take a few precautions so that your code will execute
-        correctly on all processors.
-          ☆ Limit your use of asm statements unless it is time critical code
-          ☆ Try not to rely on the endianness of the specific machines when
-            performing operations depending on data layout. In particular,
-            reading and writing binary data to/from files will probably require
-            byte swaps across different endianness machines (swapendian is your
-            friend in this case). Freepascal defines FPC_LITTLE_ENDIAN or
-            FPC_BIG_ENDIAN to indicate the target endianness.
-          ☆ Try limiting your local variables in subroutines to 32K, as this is
-            the limit of some processors. Use dynamic allocation instead.
-          ☆ Try limiting the size of parameters passed to subroutines to 32K,
-            as this is the limit of some processors. Use const or var
-            parameters where appropriate.
-          ☆ CPU16,CPU32 or CPU64 is defined indicating whether the target is a
-            16,32-bit or 64-bit cpu. This can help with incorporating 16,32-bit
-            and 64-bit specific code.
-          ☆ Use the ptruint type when declaring an ordinal that will store a
-            pointer, since pointers can be either 32-bit or 64-bit depending on
-            the processor and operating system. For 16-bit it is memory model
-            dependent.
-
-     2. Considerations in porting code to other operating systems
-
-        Because the compiler supports several different operating systems, is
-        important to take a few precautions so that your code will execute
-        correctly on all systems.
-          ☆ File sharing is implemented differently on different operating
-            systems, so opening already opened files may fail on some operating
-            systems (such as Windows). The only correct way to make sure to
-            have the same file sharing behavior is to use the I/O routines
-            provided by the sysutils unit.
-          ☆ Clean up at the end of your program, i.e. close all files on exit,
-            and release all allocated heap memory, as some operating systems do
-            not like it when some things are left allocated or opened.
-          ☆ Some operating systems limit the stack space that can be allocated,
-            therefore it is important to limit subroutine nesting, and the
-            number of local variables. Limiting total stack space usage at a
-            given moment to at most 256 KBytes will make porting easier.
-          ☆ Do not hardcode paths to files, try to use relative paths instead
-          ☆ Use the following constants (defined in the system unit) to get
-            information on files, line endings, and to build paths:
-              ○ LineEnding : Indicates the characters which end a text line
-              ○ LFNSupport : Indicates if long filenames are supported (more
-                than 8.3 characters)
-              ○ DirectorySeparator : The character or characters that separate
-                path components
-              ○ DriveSeparator : The character that separates the drive
-                specification from the rest of the path
-              ○ PathSeparator : The character that separates directories in the
-                path lists (such as the search path)
-              ○ FileNameCaseSensitive : Boolean indicating if the filenames for
-                this system may be case-sensitive or not
-              ○ AllFilesMask : String containing a wildcard expression for all
-                files
-            It is also possible to use the PathDelim, PathSep and DriveDelim
-            constants defined in the sysutils unit.
-
-     3. Compiling Delphi code using Free Pascal
-
-        The compiler supports Delphi-style classes. Make sure you use the -S2
-        or -Sd command line switches (see the manuals for the meaning of these
-        switches), or add {$mode objfpc} or {$mode delphi} to your source code.
-        For a list of Delphi incompatibilities also check the manual.
-     4. Building a unit
-
-        It works like in Turbo Pascal. The first keyword in the file must be
-        UNIT (not case sensitive). The compiler will generate two files:
-        XXX.PPU and XXX.O. The PPU file contains the interface information for
-        the compiler and the O-file the machine code (an object file, whose
-        precise structure depends on the assembler you used). To use this unit
-        in another unit or program, you must include its name in the USES
-        clause of your program.
-     5. Compiling the system unit
-
-        To recompile the system unit, it is recommended to have GNU make
-        installed. typing 'make' in the rtl source directory will then
-        recompile all RTL units including the system unit. You may choose to
-        descend into the directory of your OS (e.g. rtl/linux) and do a 'make'
-        there.
-
-        It is possible to do all this manually, but you need more detailed
-        knowledge of the RTL tree structure for that.
-     6. How does procedure overloading work?
-
-        Here is a procedure overloading example in FPC or ObjFPC mode:
-
-                            procedure a(i : integer);
-                            begin
-                            end;
-
-                            procedure a(s : string);
-                            begin
-                            end;
-
-                            begin
-                                a('asdfdasf');
-                                a(1234);
-                            end.
-
-
-        You must be careful. If one of your overloaded functions is in the
-        interface part of your unit, then all overloaded functions must be in
-        the interface part. If you leave one out, the compiler will complain
-        with a 'This overloaded function can't be local' message. Overloaded
-        functions must differ in their parameters; it is not enough if only
-        their return types are different.
-     7. Calling C functions
-
-        It is possible to call functions written in C and compiled by the GNU C
-        compiler (GCC). E.g., for calling the C function strcmp, declare the
-        following (the cint type is declared in the ctypes unit):
-
-        function strcmp(s1 : pchar;s2 : pchar) : cint;cdecl;external;
-
-     8. Integrated Assembler syntax
-
-        The default assembler syntax (AT&T style) is different from the one in
-        Borland Pascal (Intel style). FPC however supports both styles. See the
-        documentation for more info on how to use different assembler styles.
-
-        A description of the AT&T syntax can be found in the GNU Assembler
-        documentation.
-     9. Unit system not found errors
-
-        System is Pascal's base unit and is implicitly used by all programs.
-        This unit defines several standard procedures and structures, and must
-        be found to be able to compile any Pascal program by FPC.
-
-        The location of the system and other unit files is passed on to the
-        compiler by the -Fu switch. This switch can be specified on the command
-        line, but is usually located in the fpc.cfg configuration file.
-
-        If the compiler cannot find this unit, there are three possible causes:
-         1. The fpc.cfg file is not in the same directory as the compiler
-            executable (msdos,go32v2, win32 and OS/2) or cannot be found as "/
-            etc/fpc.cfg" or ".fpc.cfg" in your homedirectory (UNIX platforms).
-         2. The fpc.cfg file does not contain the -Fu parameter, or a wrong
-            one. See the build faq (PDF), especially the chapters about the
-            fpc.cfg and the directory structure.
-         3. The unit files ARE found, but are the wrong version or for a
-            different platform. Correct fpc.cfg to point to the right versions
-            or reinstall the right versions (this can e.g. happen if you try to
-            use a snapshot compiler while the -Fu statement in the used fpc.cfg
-            still points to the RTL that came with the official release
-            compiler).
-
-        A handy trick can be executing "fpc programname -vtu". This will show
-        where the compiler is currently looking for the unit files. You might
-        want to pipe this through more (Dos, OS/2, Windows) or less (UNIX),
-        since it can generate more than one screen information:
-
-                            Dos, OS/2, Windows: fpc programname -vt |more
-
-                            UNIX, Linux: fpc programname -vt |less
-
-
-
-    10. There is a new language extension that would be really useful. Will you
-        include it?
-
-        Occasionally somebody asks for a new language extension on the
-        maillist, and the discussions that follow have a recurring pattern. An
-        extension is quite a big deal for the FPC team, and there are some
-        criteria that are used to select if an extension is "worth" the
-        trouble. The most important pre-selection criteria are:
-         1. Compatibility must not be compromised in any way. Existing
-            codebases on at least the Pascal level must keep running. This is
-            often more difficult than most people think.
-         2. The extension must have real value. Anything that is only a shorter
-            notation does not apply, unless it is out of compatibility with an
-            existing Pascal/Delphi codebase. Practically it means it must make
-            something possible that cannot be done otherwise or be a
-            compatibility item
-         3. The change must fit in with the scope of the project: implementing
-            a Pascal compiler with support for RAD and a generic DB system.
-            This excludes features like inline SQL, and large garbage collected
-            object frameworks.
-        Exceptions to the second rule are sometimes made for platform-specific
-        reasons (e.g. interfacing to some other language or OS). The first rule
-        is often a problem, because issues are not easily recognizable unless
-        one has tried to make extensions before. Best is to make a thoroughly
-        written proposal that the developers can review, including
-          ☆ an explanation of the feature
-          ☆ why it is needed, what does it make possible?
-          ☆ how you would implement it?
-          ☆ many examples of typical use, and tests for possible problem cases
-        Try to be verbose and really try to view this from the viewpoint of
-        somebody who has to implement it, and try to make examples that span
-        multiple units and procedures, and review what happens. Be critical,
-        try to punch holes in your own reasoning and find possible problematic
-        cases, and document them.
-
-        Besides these pre-selection rules and documentation, the other
-        important question is who is going to do the work. Keep in mind that
-        the FPC developers are volunteers with todo-lists that are booked till
-        the next decade. You cannot expect they will drop everything from their
-        hands and implement the feature because you need it urgently, or think
-        it is nice. If you are not willing to implement it yourself, submit
-        patches and maintain it in the future, chances are slim. Remarks as
-        "this will attract a lot of users because..." are considered with a lot
-        of scepsis, since that applies to any new development.
- 3. Runtime library related information
-
-     1. Why do I get wrong colours when using the graph unit?
-
-        If you use detect as graphdriver, you will end up with the highest
-        supported bitdepth. Since the graph unit currently only supports up to
-        16 bits per pixel modes and since this bitdepth is supported by
-        virtually all graphics cards, you will most likely get a 16 bit mode.
-
-        The main problem is that in 16 (and 15, 24, 32, ...) bit modes, the
-        colors are not set anymore using an index in a palette (the palettized
-        way is called "indexed color"). In these modes, the color number itself
-        determines what color you get on screen and you can not change this
-        color. The color is encoded as follows (for most graphics cards on PC's
-        at least):
-          ☆ 15 bit color: lower 5 bits are blue intensity, next come 5 bits of
-            green and then 5 bits of red. The highest bit of the word is
-            ignored.
-          ☆ 16 bit color: lower 5 bits are blue intensity, next come *6* bits
-            of green and then 5 bits of red.
-
-        This means that either you have to rewrite your program so it can work
-        with this so-called "direct color" scheme, or that you have to use
-        D8BIT as graphdriver and DetectMode as graphmode. This will ensure that
-        you end up with a 256 (indexed) color mode. If there are no 256 color
-        modes supported, then graphresult will contain the value GrNotDetected
-        after you called InitGraph and you can retry with graphdriver D4BIT.
-     2. File sharing and file locks
-
-        The standard runtime library file I/O routines open files in the
-        default sharing mode of the operating system (system, objects units).
-        Because of this, you might get problems if the file is opened more than
-        once either by another process or the same process.
-
-        Generally the behaviors for the different operating systems are as
-        follows :
-          ☆ UNIX systems : There is no verification at all.
-          ☆ Windows : An access denied error will be reported.
-          ☆ DOS / OS/2 : If the file is opened more than once by the same
-            process, no errors will occur, otherwise an access denied error
-            will be reported.
-
-        There are two ways to solve this problem:
-          ☆ Use specific operating system calls (such as file locking on UNIX
-            systems) to get the correct behavior.
-          ☆ Use the sysutils unit or the Free Component Library TFileStream
-            File I/O routines, which try to simulate, as much as possible, file
-            sharing mechanisms.
-     3. File denied errors when opening files with reset
-
-        Trying to open files using reset on non-text files might cause a
-        Runtime Error 5 (Access denied).
-
-        All files opened using the above system unit routine use the current
-        filemode value to determine how the file is opened. By default,
-        filemode is set to 2 (Read/Write access).
-
-        So, a call to reset on non-text files does not indicate that the file
-        will be opened read-only. So, trying to open a file using reset with
-        the defaults will fail on read-only files. filemode should be set to 0
-        (Real-only access) before calling reset to solve this problem. A sample
-        solution is shown below.
-
-                      const
-                         { possible values for filemode }
-                         READ_ONLY = 0;
-                         WRITE_ONLY = 1;
-                         READ_WRITE = 2;
-                      var
-                         oldfilemode : byte;
-                         f: file;
-                      begin
-                         assign(f,'myfile.txt');
-                         oldfilemode := filemode;
-                         { reset will open read-only }
-                         filemode := READ_ONLY;
-                         reset(f,1);
-                         { restore file mode value }
-                         filemode := oldfilemode;
-                         // ...
-                         close(f);
-                      end.
-
-
-        For more information, consult the Free Pascal reference manual
- 4. Windows-related information
-
-     1. Releasing software generated by the windows compiler
-
-        There is no special requirements for releasing software for the Windows
-        platform, it will work directly out of the box. The following are
-        default for the Windows platform:
-          ☆ Stack size is unlimited
-          ☆ The stack checking option is not available on this platform.
-
-     2. Debugging
-
-        The GNU debugger v6.4 and later have been tested, and generally work as
-        they should. Because the GNU debugger is C oriented, some pascal types
-        might not be represented as they should. It is suggested to use the
-        text mode IDE instead of GDB, which is available for windows targets.
-
-     3. Dynamic libraries
-
-        Creation and use of shared libraries (also called dynamic link
-        libraries) is fully supported by the compiler. Refer to the
-        Programmer's Reference Manual for more information on shared library
-        creation and use.
-     4. Profiling
-
-        Profiling is supported using gprof. It requires mingw to be installed,
-        and that fpc.cfg points to the correct library paths.
-     5. Graph and problems with keyboard, mouse and "dummy dos windows"
-
-        Problem:
-          ☆ If you use the Graph unit under Win32, you cannot use the API mouse
-            unit for mouse support or use the win32 Crt unit to get keyboard
-            data. The reason for this is that the created window is a GUI
-            window, and not a console one.
-        Solution:
-          ☆ Use units WinMouse and WinCrt instead.
-
-        Problem:
-          ☆ When you follow the above advice, and you run your purely Graph
-            based win32 program from the RUN menu in windows, a dummy dos
-            window is opened.
-        Solution:
-          ☆ Set the application type to GUI:
-
-            {$apptype GUI}
-
-            and put this line before your programs InitGraph statement:
-
-            ShowWindow(GetActiveWindow,0);
-
-
-            This will hide the dos window window.
-
-        Some of the demos (like fpctris) use these techniques
-     6. Cygwin binary directory in your path sometimes causes strange problems
-
-        The mingw make tool seems to look for a "sh.exe", which it finds when
-        the cygwin binary directory is in the path. The way directories are
-        searched changes, and the build process dies.
-
-        Solution: do not put cygwin in your global path for now, only add it
-        when needed. Efforts are made to work around this.
-
-        Possible untested workaround: add mingw sh.exe to a directory before
-        the cygwin binary directory in the path
-     7. Using the DOS compiler under Windows 95
-
-        There is a problem with the DOS (GO32V2) compiler and Windows 95 on
-        computers with less than 16 Megabytes of RAM. First set in the
-        properties of the DOS box the DPMI memory size to max value. Now try to
-        start a demo program in the DOS box, e.g. HELLO (starting may take some
-        time). If this works you will be able to get the compiler to work by
-        recompiling it with a smaller heap size, perhaps 2 or 4 MB (option
-        -Chxxxx).
-     8. Using DOS generated applications under windows
-
-        Several problems have been found running DOS software under certain
-        versions of Windows (NT / 2000 / XP). These seem to be problems with
-        the DOS emulation layers (emulated DPMI services or the Go32 extender).
-        These problems may not occur with all software generated by FPC. Either
-        applications should be tested on these systems before being released,
-        or Windows versions should be generated instead.
-     9. The mouse cursor does not respond in the Windows IDE
-
-        In windowed mode, the IDE might not respond to mouse moves and clicks.
-        Just change the properties of the console, and remove the quick edit
-        mode option. This should solve the mouse response problems.
- 5. UNIX-related information
-
-    This section also applies to most UNIX variants, such as Linux, FreeBSD and
-    Mac OS X.
-     1. Releasing software generated by the UNIX compilers
-
-          ☆ There is no stack space usage limit.
-          ☆ Stack checking is simulated.
-          ☆ Minimal operating system versions :
-              ○ Linux : Kernel v2.4.x or later.
-              ○ FreeBSD : version 5.x or later. (4.x can be made to work with
-                minor work)
-              ○ NetBSD : version 1.5 or later.
-              ○ Solaris : version 5.7 of SunOS or later (should work with
-                earlier versions, but untested).
-              ○ Mac OS X : version 10.4 or later (Intel), or 10.3.9 or later
-                (PowerPC)
-
-     2. Debugging
-
-        The GNU debugger v6.5 and later have been tested, and generally work as
-        they should. Because the GNU debugger is C oriented, some pascal types
-        might not be represented as they should.
-
-     3. Dynamic libraries
-
-        Creating dynamic libraries under UNIX-like operating systems is
-        supported.
-
-        Importing code from shared libraries does work as expected though,
-        since it does not require usage of position independant code.
-     4. Profiling
-
-        Profiling is supported using gprof under linux, FreeBSD and NetBSD, the
-        latter two only since 1.0.8. On other other UNIX-like operating
-        systems, profiling is currently not supported.
-     5. Libc is missing on platforms other than Linux/i386
-
-        Libc is a Kylix compatibility unit. Because it contains many i386
-        specific code and features structures from legacy kernels, it has not
-        been made available on other platforms.
-
-        To access UNIX functionality, please use units like baseunix and unix.
-     6. Why can't the linker find "vga"?
-
-        This error typically looks like this:
-
-                         Free Pascal Compiler version 3.2.x [xxxx/yy/zz] for i386
-                         Copyright (c) 1993-2008 by Florian Klaempfl
-                         Target OS: Linux for i386
-                         Compiling test.pp
-                         Assembling test
-                         Linking test
-                         /usr/bin/ld: cannot find -lvga
-                         test.pp(6,4) Warning: Error while linking Closing script ppas.sh 5 Lines
-                         compiled, 0.2 sec
-
-
-        This error is not an error in the installation of FPC or FPC itself,
-        but a missing Svgalib library in your UNIX install. Please install the
-        required library using your favourite package manager tool
-     7. Compiler indicates missing as and ld
-
-        Normally UNIX systems have the assembler (as) and linker (ld)
-        pre-installed and already in the search path. That is the reason why
-        these tools are not supplied with the compiler.
-
-        If the compiler cannot find these tools, either they are not in your
-        search path, or they are not installed. You should either add the path
-        where the tools are located to your search path, and / or you should
-        install these tools.
-     8. An error occurred while linking, or "did you forget -T?"
-
-        There is a bug in GNU LD 2.19 and 2.19.1 that causes it to crash when
-        processing FPC-generated linker scripts. This bug has been fixed in the
-        mean time.
-
-        At the same time, LD has been modified to emit a warning of the form
-
-                       /usr/bin/ld: warning: link.res contains output sections; did you forget -T?
-
-
-        This warning is benign, and FPC intentionally does not pass -T to LD.
-        The reason is that if -T is used, LD's internal linker script is
-        ignored and only FPC's linker script is used. Such linker scripts also
-        contain paths to libraries however, and if we would ignore the internal
-        linker script then LD would no longer find libraries in
-        distribution-specific directories.
-
- 6. OS/2-related information
-
-     1. Releasing software generated by the OS/2 compiler
-
-        The OS/2 compiler version 1.0.x and before is based on EMX, therefore
-        it should work both on OS/2 and on vanilla DOS systems. In version
-        1.9.x and above this functionality is preserved in newly added target
-        EMX, whereas binaries for target OS2 can only run under real OS/2. The
-        following notes apply to OS2 target in 1.0.x and EMX in 1.9.x and
-        above:
-          ☆ All applications generated for the OS/2 (EMX) target require the
-            EMX 0.9d (or later) runtime files to run. These files should be
-            redistributed with your software. All the files which should be
-            redistributed are included in emxrt.zip
-          ☆ Under OS/2, LIBPATH should be modified to add the EMX DLL paths.
-            Otherwise, programs will not run and will abort with an error
-            'Cannot find EMX.dll'.
-          ☆ Stack can grow up to 256 Kbytes by default. This can be changed by
-            the user or developper using the emxstack or emxbind utilities.
-
-     2. Debugging
-
-        The GNU debugger v4.16 (EMX port) has been tested (including its PM
-        add-on, pmgdb.exe) and generally works as it should. Because the GNU
-        debugger is C oriented, some pascal types might not be represented
-        correctly.
-
-     3. Dynamic libraries
-
-        Even though this operating system permits the creation and usage of
-        shared libraries (also called dynamic link libraries), the compiler
-        currently only permits importing routines from dynamic libraries
-        (creation of dynamic libraries is unsupported).
-     4. Profiling
-
-        Profiling is currently not supported for this platform.
-     5. Using DOS generated applications under OS/2
-
-        It has been reported that some DOS (GO32V2) applications (including the
-        DOS compiler itself) generated by the compiler fail on some OS/2
-        installations. This is due to problems in the OS/2 DPMI server.
-
-        You should use native OS/2 applications under OS/2 (including the
-        native OS/2 compiler) or try installing a new OS/2 fixpack to see if it
-        solves the problem.
-     6. INSTALL.EXE complains about a missing TZ variable under OS/2
-
-        You are most probably using an older version of OS/2 (like OS/2 Warp
-        3.0) and do not have TZ variable in your environment. The easiest
-        solution is to add "SET TZ=..." (e.g. "SET TZ=
-        CET-1CEST,3,-1,0,7200,10,-1,0,10800,3600" for most of western and
-        central Europe) line to your CONFIG.SYS, and restart OS/2. The proper
-        setting for you can be found e.g. using the TZCALC tool from TIME868
-        package.
-     7. OS/2 compiler not working after upgrading to 1.9.6 or newer
-
-        An updated version of GNU assembler (as.exe) is packaged with release
-        1.9.6 (newer version was necessary to get support for features of
-        modern CPUs). This version of the GNU tool was created with Innotek
-        port of GNU C and relies on its libc. This results in higher
-        limitations regarding supported configurations, because this libc needs
-        recent version of OS/2 Unicode support libraries (LIBUNI.DLL and
-        UCONV.DLL) not available in base OS/2 Warp 3.0 and OS/2 Warp 4.0. The
-        updated versions were distributed by IBM in corrective packages
-        (fixpaks) - see e.g. WarpUpdates site for information about OS/2
-        fixpaks and links for downloading them. This issue isn't valid for
-        WarpServer for e-Business, MCP and eComStation - these already have the
-        correct version.
-     8. Compilation under OS/2 fails with error "Can't call the assembler"
-
-        Apart from the point mentioned above, there is at least one more
-        potential reason for issues with executing the assembler and resulting
-        in error message "Can't call the assembler, error 2 switching to
-        external assembling". This error may be result of the OS/2 system not
-        being able to find DLLs required for the assembler. Make sure that you
-        installed FPC completely (these DLLs are part of file asldos2.zip) and
-        that you have set LIBPATH according to instructions in README.TXT (and
-        restarted afterwards). If in doubts, running the assembler directly
-        from the command line (e.g. "as --version" to show the installed as.exe
-        version) may be helpful to see name of the missing dynamic library or
-        other details about the problem.
- 7. BeOS-related information
-
-     1. Releasing software generated by the BeOS compiler
-
-        Software generated for the BeOS target will only work on the Intel
-        based version of BeOS.
-          ☆ The target system must have at least BeOS v4.0 or later (BeOS 5.1d
-            'Dano' is not supported)
-          ☆ Stack size is set to 256 Kbytes. This cannot be changed
-
-     2. Debugging
-
-        Debugging works with the system-supplied gdb version.
-
-     3. Dynamic libraries
-
-        Even though this operating system permits the creation and usage of
-        shared libraries (also called dynamic link libraries), the compiler
-        currently only permits importing routines from dynamic libraries
-        (creation of dynamic libraries is unsupported).
-     4. Profiling
-
-        Profiling is currently not supported for this platform.
-     5. BeOS Linking problems
-
-        It has been reported that certain versions of the linker that shipped
-        with some versions of BeOS are broken. If you get an error when linking
-        fpc applications, try updating your version of ld from the following
-        site.
-
- 8. DOS-related information
-
-     1. Releasing software generated by the DOS compiler
-
-          ☆ If your program uses floating point code (which is very probable),
-            make sure to read "Applications created with Free Pascal crash on
-            80386 systems" regarding special issues which might occur. Math
-            coprocessor emulation software is then required (wmemu387.dxe
-            should be redistributed with your software)
-          ☆ The target system must have a DPMI server. To avoid problems, the
-            file cwsdpmi.exe should always be redistributed with your
-            application
-          ☆ The target system must have DOS 3.3 or later
-          ☆ The default stack size is 256 Kbytes. See also "Changing the
-            default stack size"
-          ☆ The stack checking option is available on this platform.
-
-     2. Debugging
-
-        The GNU debugger v4.16 and later have been tested, and generally work
-        as they should. Because the GNU debugger is C oriented, some pascal
-        types might not be represented as they should. It is suggested to use
-        the text mode IDE instead of GDB, which is available for the DOS
-        target.
-
-     3. Dynamic Libraries
-
-        Creation or use of shared libraries (also called dynamic link
-        libraries) is not supported under this platform.
-     4. Profiling
-
-        Profiling with gprof is supported for this platform.
-     5. Running Free Pascal without a math coprocessor?
-
-        On the Intel version the emulator is automatically loaded by the
-        compiler if you add the following commands to your autoexec.bat:
-
-                            SET 387=N
-                            SET EMU387=C:\PP\BIN\GO32V2\WEMU387.DXE
-
-
-        (do not forget to replace the C:\PP with the directory where you
-        installed FPC)
-     6. Applications created with Free Pascal crash on 80386 systems
-
-          ☆ Trying to run an application which performs floating point
-            operations on a 386 system without a math co-processor will crash
-            unless the emu387 unit is used, as this unit loads the math
-            co-processor emulator (called wmemu387.dxe). You can add the unit
-            as follows:
-
-                                    program myprog;
-                                    uses emu387, ...
-
-
-            When the application is released, the software package should also
-            include the wmemu387.dxe redistributable file to avoid problems. .
-          ☆ Some 80386 systems have a hardware bug which corrupt the
-            accumulator register EAX if it is used in a MOV instruction just
-            after a POPAL instruction. Prior to version 1.0.5, the compiler and
-            runtime library could generate such code sequences. This is now
-            fixed and should no longer cause problems
-
-     7. The mouse cursor is not visible in graphics screens
-
-        Many DOS mouse drivers do not properly support mouse cursors in VESA
-        modes. Logitech is said to have a decent mouse driver, which can be
-        found here
-     8. Accessing I/O ports
-
-        The Port array is supported like in TP, as long as you use the ports
-        unit in your program (not available under Win32).
-
-        I/O port access is possible under Linux, but that requires root
-        privileges. Check the manuals for the IOPerm, ReadPort and WritePort
-        procedures. (Unit Linux)
-     9. Accessing DOS memory / Doing graphics programming
-
-        You can do like in Turbo Pascal, via absolute or mem[]. For larger
-        memory blocks use the dosmemput/dosmemget routines in the Go32 unit.
-    10. Changing the default stack size
-
-        Under the DOS (GO32V2) target, the default stack size to 256 bKbytes.
-        This can be modified with a special DJGPP utility called stubedit. It
-        is to note that the stack may also be changed with some compiler
-        switches, this stack size, if greater then the default stack size will
-        be used instead, otherwise the default stack size is used.
+            Version:
+                Currently, Free Pascal is at version 3.2.2 (May 2021). GNU
+                Pascal is stopped version 2.1 (from 2002, which can be built
+                with several different GCC's as backend; their Mac OS X version
+                is an exception though, as it follows the GCC version number).
+            Tracking:
+                Between releases, development versions of FPC are available
+                through daily snapshots and the source via SVN. GPC issues a
+                set of patches to the last version a few times a year, and
+                there are regular snapshot for OS X and Windows, made by users.
+                Operating systems:
+                    Free Pascal runs on a large number of platforms, inlcuding
+                    DOS (16/32-bit), Win32 (no UNIX porting layer needed),
+                    Linux, FreeBSD, NetBSD, OS/2, BeOS, Mac OS X, on the
+                    following architectures: x86 (32 and 64 bit), SPARC,
+                    PowerPC (32 and 64 bit), ARM, Java Virtual Machine (under
+                    development), and MIPS (under development). GNU Pascal runs
+                    basically on any system that supported by GCC, and for
+                    which the build process was verified.
+                    Bootstrapping:
+                        FPC requires a suitable set of binutils (AS, AR, LD) on
+                        some platforms, GNU make and a command line bootstrap
+                        compiler. New architectures/OSes are cross-compiled.
+                        GPC bootstraps via a suitable version of GCC, and
+                        requires a full set of binutils, flex, bison, gmake, a
+                        POSIX shell and libtool
+                        Sources:
+                        Free Pascal is entirely written in Pascal, while GNU
+                        Pascal is written in C (it's an adaptation of the GNU C
+                        compiler)
+                        Language:
+                        Free Pascal supports the Borland Pascal dialect,
+                        implements the Delphi Object Pascal language,
+                        Objective-Pascal and has some support for ISO 7185
+                        Pascal and Mac Pascal extensions. GNU Pascal supports
+                        ISO 7185, ISO 10206 and (most of) Borland Pascal 7.0
+                        Extensions:
+                        Free Pascal implements method, function and operator
+                        overloading (later Delphi versions have also added
+                        these, so strictly they are not extensions anymore) GNU
+                        Pascal implements operator overloading.
+                        License:
+                        Both compilers come under the GNU GPL.
+                        Author:
+                        Free Pascal was started by Florian Klämpfl, Germany
+                        (florian@freepascal.org), GNU Pascal was started by
+                        Jukka Virtanen, Finland (jtv@hut.fi).
+
+                            License and copyright information
+
+                        Applications created by the compiler and using the
+                        runtime library (RTL) come under a modified Library GNU
+                        Public License (LGPL). This license does not impose any
+                        kind of license on the created applications. It is
+                        therefore possible to create closed source or
+                        proprietary software using the Free Pascal Compiler.
+
+                        The following exception has been added to the LGPL
+                        variant that applies to the FPC RTL:
+
+                        As a special exception, the copyright holders of this
+                        library give you permission to link this library with
+                        independent modules to produce an executable,
+                        regardless of the license terms of these independent
+                        modules, and to copy and distribute the resulting
+                        executable under terms of your choice, provided that
+                        you also meet, for each linked independent module, the
+                        terms and conditions of the license of that module. An
+                        independent module is a module which is not derived
+                        from or based on this library. If you modify this
+                        library, you may extend this exception to your version
+                        of the library, but you not obligated to do so. If you
+                        do not wish to do so, delete this exception statement
+                        from your version.
+
+                        Please note that you still have to comply to the LGPL
+                        as far as sources of the runtime library itself are
+                        concerned. This, for example, requires you to provide
+                        the source code of the runtime library if a recipient
+                        of your application asks for it. If you want to write
+                        proprietary closed source software, please comply with
+                        the following terms:
+                          • Most people can satisfy the source code requirement
+                        by mentioning that the RTL source code can be
+                        downloaded at the Free Pascal web site: if you did not
+                        modify the rtl this is considered adequate to satisfy
+                        the LGPL requirement of providing source code.
+                          • If you made modifications to the runtime library,
+                        you cannot keep them for yourself, you must make them
+                        available if requested by recipients of your
+                        application.
+                          • Distribute the modified LGPL license with your
+                        product, indicating to which parts of your application
+                        it applies (the FPC RTL).
+
+                        The compiler source code, on the other hand, comes
+                        under the GNU General Public License, which means that
+                        the compiler source can only be used in software
+                        projects that are distributed under a compatible
+                        license (or that are not distributed at all).
+                            Getting the compiler
+
+                        The latest official stable Free Pascal release is
+                        available for download from all official mirrors
+                            Free Pascal installation hints
+
+                          • Do not install the compiler in a directory that has
+                        spaces in its name, since some of the compiler tools do
+                        not like these
+                            Why do i have to supply a user name and password to
+                        get Free Pascal ?
+
+                        You are trying to login to an ftp site. You have to use
+                        the login name "anonymous" and your e-mail address as
+                        your password.
+                            Access denied error when connecting to the Free
+                        Pascal FTP site
+
+                        The Free Pascal main ftp site can only accept a maximum
+                        number of simultaneous connections. If this error
+                        occurs, it is because this limit has been reached. The
+                        solution is either to wait and retry later, or better
+                        still use one of the Free Pascal mirror sites.
+                            I want a new version NOW
+
+                        In the time between the release of new official
+                        versions, you can have a look at and test developer
+                        versions (so-called "snapshots"). Be warned though:
+                        this is work in progress, so in addition to old bugs
+                        fixed and new features added, this may also contain new
+                        bugs.
+
+                        Snapshots are generated automatically each night from
+                        the current source at that moment. Sometimes this may
+                        fail due to bigger changes not yet fully implemented.
+                        If your version does not work, try again one or two
+                        days later.
+
+                        The latest snapshot can always be downloaded from the
+                        development web page.
+                            Installing a snapshot
+
+                        To install a snapshot, extract the zip archive into the
+                        existing program directory of the last official version
+                        of Free Pascal (after making a backup of the original,
+                        of course). You can also extract it into an empty
+                        directory and then move the files to the program
+                        directory, overwriting existing files.
+                            I have to write a program for homework. Can you
+                        help?
+
+                        No. Please, don't send us mail about homework, we are
+                        no teachers. The Free Pascal development team tries to
+                        give good support for the Free Pascal compiler and are
+                        trying to always reply to emails. If we get emails like
+                        this, this becomes harder and harder.
+                            How do I make a real Windows application with
+                        windows and menu bars?
+
+                        The easiest way is to download Lazarus. It won't be
+                        just a Windows application, it will also work under
+                        Linux, FreeBSD and Mac OS X.
+                            How do I make a game with Free Pascal? Can I make a
+                        game like Doom 3?
+
+                        Yes, you can make games with Free Pascal and if you are
+                        really good you can make a game like Doom 3. Making
+                        games is difficult, you need to be an experienced
+                        programmer to make them. The web site
+                        www.pascalgamedevelopment.com is a community of people
+                        who program games in Free Pascal and Delphi.
+
+                        If you want a start, please start to study JEDI-SDL or
+                        PTCPas. Also you can try to study an existing game, for
+                        example The Sheep Killer is a very simple game and it
+                        should not be very hard to understand its code.
+                            Getting more information when an application
+                        crashes
+
+                         1. The easiest possibility is to recompile your
+                        program with -gl debugging option. This way unit
+                        LineInfo is automatically linked in, and the printout
+                        after a program crash then contains source line numbers
+                        in addition to addresses of the crash. To see runtime
+                        library (RTL) functions in the backtrace with their
+                        real name, you have to recompile the RTL with -gl too.
+                         2. For more comprehensive checking, compile the
+                        program with debugging information (use the -g command
+                        line option)
+                         3. Load the program in the debugger
+
+                        gdb --directory=<src dirs> myprog.exe
+
+                        Notes:
+                         4. Under UNIX systems (Linux, the BSD's), don't add
+                        the ".exe" after myprog
+                         5. "src dirs" is a list of directories containing the
+                        source code files of myprog and the units it uses
+                        seperated by semi-colons (";") on Windows, or colons
+                        (":") on UNIX platforms. The current directory is
+                        automatically included.
+                         6. Once inside the debugger, you can (optionally) set
+                        the command line options that will be passed to your
+                        program using the command "set args <option1 option2
+                        ...>"
+                         7. To start the program, type "run" and press enter
+                         8. After the program has crashed, the address of the
+                        instruction where the crash occurred will be shown. The
+                        debugger will try to display the source code line
+                        corresponding with this address. Note that this can be
+                        inside a procedure of the RTL, so the source may not
+                        always be available and most likely the RTL wasn't
+                        compiled with debugging information.
+                         9. If you then type "bt" (BackTrace), the addreses on
+                        the call stack will be shown (the addresses of the
+                        procedures which were called before the program got to
+                        the current address). You can see which source code
+                        lines these present using the command
+
+                        info line *<address>
+
+                        For example:
+
+                        info line *0x05bd8
+
+                            Compiler seems to skip files in directories -Fu
+                        points to
+
+                        This sometimes happens with installation/compilation
+                        scripts if the copying command doesn't preserve dates.
+                        The object files get older than the PPU file, and the
+                        compiler tries to recompile them. A simple touch will
+                        solve it.
+
+                        Also note that FPC, contrary to Turbo Pascal keeps
+                        track of include files. Modified include files or
+                        duplicate names can trigger an attempt to recompile.
+                            Why are the generated binaries so big?
+
+                        There are several reasons and remedies for this:
+                         1. You can create smartlinked applications. To turn on
+                        the generation of smartlinkable units, use the -CX
+                        command line option when compiling your units. To turn
+                        on the linking of previously generated smarlinkable
+                        units, use the -XX command line option when compiling a
+                        program.
+                         2. Normally, all symbol information is included in the
+                        resulting program (for easier debugging). You can
+                        remove this by using the -Xs command line option when
+                        compiling your program (it will not do anything when
+                        compiling units)
+                         3. Turn on optimisations, both for supplied packages
+                        (RTL, FV, FCL) and for your own code, this will also
+                        decrease the code size.
+                        Generally Free Pascal generates smaller binaries than
+                        modern competing compilers, however, it does not hide
+                        code in large dynamic libraries. Free Pascal generates
+                        larger binaries than compilers from long ago do. Large
+                        framework libraries result in larger executables. See
+                        also the Size Matters wiki entry.
+                            Runtime errors
+
+                        When an application generated by FPC terminates in an
+                        abnormal way, it is very likely that a runtime error
+                        will be generated. These errors have the form :
+
+                                    Runtime error 201 at $00010F86
+                                      $00010F86  main,  line 7 of testr.pas
+                                      $0000206D
+
+
+                        The 201 in this case indicates the runtime error
+                        number. The definition of the different runtime error
+                        numbers is described in the Free Pascal user's manual,
+                        Appendix D. The hexadecimal numbers represent the
+                        addresses on the call stack when the error occured.
+                            Standard units
+
+                        To see the list of base units supplied with Free
+                        Pascal, and on which platform they are supported,
+                        consult the Free Pascal user's manual. There is also a
+                        short description of what each unit does in the same
+                        section of the manual.
+                            Debugging smartlinked code does not fully work
+
+                        Debugging smart linked code might not work correctly.
+                        This is due to the fact that no type information is
+                        emitted for smartlinked code. If this would not be
+                        done, the files would become enormous.
+
+                        While debugging, it is not recommended to use the
+                        smartlinking option.
+                            Cannot compile a program using a binary-only
+                        version of a unit
+
+                        Sometimes, even though there is a binary version of a
+                        module (unit file and object file) available, the
+                        compiler claims it cannot find the unit This can be
+                        caused either by an incompatibility in the PPU file
+                        format (which can change across compiler versions), or
+                        by a change in one of the units of the RTL that has
+                        changed in between releases.
+
+                        To get more information, compile the code using the
+                        -vtu (show tried and used unit information) compiler
+                        switch, and the unit loading phase will be displayed.
+                        You might discover that the unit being loaded requires
+                        to be recompiled because one of the unit it uses has
+                        changed.
+
+                        If you plan on distributing a module without the source
+                        code, the binaries should be compiled and made
+                        available for all versions of the compiler you wish to
+                        support, otherwise compilation errors are bound to
+                        occur.
+                            Will you support ISO Extended Pascal?
+
+                        FPC's primary goal is to be a Turbo Pascal and
+                        Delphi-compatible compiler, and it also supports a
+                        subset of the Mac-Pascal dialect and of Standard ISO
+                        Pascal. While in theory it would be possible to add a
+                        complete ISO Standard or Extended Pascal modes, until
+                        now no people interested in such functionality have
+                        stepped up to work on such features.
+
+                        GNU-Pascal is however a modern compiler that can
+                        compile ISO Extended Pascal. If you have any need for
+                        the ISO Extended Pascal dialect, we recommend you to
+                        take a look at this compiler.
+                            What about .NET?
+
+                        Occasionally, users ask about a FPC that supports .NET,
+                        or our plans in that direction.
+
+                        Mainly the users are either interested because of
+                        .NET's portability aspects (Mono is quoted over and
+                        over again), or because it is supposed to be the next
+                        big thing in Windows programming, and they think
+                        Windows programming will not be possible in the future.
+
+                        While the FPC core developpers are somewhat interested
+                        out of academic curiousity (mainly because it could be
+                        a pilot for a generalized backend creating bytecode)
+                        there are however several problems with .NET in
+                        combination with FPC:
+                         1. Pascal is a language that uses pointers, and
+                        existing codebases can only be unmanaged. Unmanaged
+                        code is not portable under .NET, so that already kills
+                        most possible benefits. This also means that existing
+                        FPC and Delphi code won't run on .NET. There are more
+                        such little language problems.
+                         2. FPC's libraries are not based on .NET classes and
+                        data models (and cannot be changed to do so without
+                        effectively rewriting them), moreover the libraries
+                        could only be unmanaged too, or they would be
+                        incompatible
+                         3. There is nothing practical known yet about how
+                        portable an average .NET program will be. Little
+                        experiments with hello world level code mean nothing,
+                        that kind of code works with nearly any language. A
+                        good test would be to see existing non trivial
+                        codebases run unmodified under mono, that were not
+                        designed with mono in mind. Just like we try to do for
+                        Delphi
+                         4. The fact that on Windows 80% of the .NET code seems
+                        to be ASP.NET does not help either. This makes porting
+                        existing code less useful (since ASP.NET is tied to
+                        IIS), and new codebases of portable code can be set in
+                        nearly every language
+                         5. Operating System dependant code would not work
+                        anymore, since the Win32/64 interface is unmanaged.
+
+                        So effectively this means that for FPC to benefit from
+                        .NET you would have to significantly adapt the language
+                        (thus compiler) and libraries, and be incompatible with
+                        the existing native sourcecode. Moreover that also
+                        means that existing apps would have to be rewritten for
+                        .NET, since it would take more than a simple recompile
+                        with a FPC/.NET compiler.
+
+                        While unmanaged code has some uses (easier integration
+                        with managed code inside Windows), this still requires
+                        writing a code generator and defining interfaces and
+                        libraries. This means a lot of work and since .NET
+                        take-up is not really high, this might not be worth it.
+
+                        However if a FPC user does the bulk of the work (e.g. a
+                        bytecode codegenerator, and maybe some base libraries)
+                        and if the work is suitable for inclusion in FPC (a
+                        very big if), we will of course include it.
+
+                        Since support for generating JVM bytecode has been
+                        added to the compiler, such a project may be more
+                        realistic now than it has been in the past. Many of the
+                        caveats mentioned above still hold though: language
+                        compatibility is not 100% and most standard units will
+                        have to be reimplemented.
+
+                            Pascal language related information
+
+                         1. Considerations in porting code to other processors
+
+                        Because the compiler supports multiple processor
+                        architectures, it is important to take a few
+                        precautions so that your code will execute correctly on
+                        all processors.
+                          • Limit your use of asm statements unless it is time
+                        critical code
+                          • Try not to rely on the endianness of the specific
+                        machines when performing operations depending on data
+                        layout. In particular, reading and writing binary data
+                        to/from files will probably require byte swaps across
+                        different endianness machines (swapendian is your
+                        friend in this case). Freepascal defines
+                        FPC_LITTLE_ENDIAN or FPC_BIG_ENDIAN to indicate the
+                        target endianness.
+                          • Try limiting your local variables in subroutines to
+                        32K, as this is the limit of some processors. Use
+                        dynamic allocation instead.
+                          • Try limiting the size of parameters passed to
+                        subroutines to 32K, as this is the limit of some
+                        processors. Use const or var parameters where
+                        appropriate.
+                          • CPU16,CPU32 or CPU64 is defined indicating whether
+                        the target is a 16-bit, 32-bit or 64-bit cpu. This can
+                        help with incorporating 16-bit, 32-bit and 64-bit
+                        specific code.
+                          • Use the ptruint type when declaring an ordinal that
+                        will store a pointer, since pointers can be either
+                        32-bit or 64-bit depending on the processor and
+                        operating system. For 16-bit it is memory model
+                        dependent.
+
+                         2. Considerations in porting code to other operating
+                        systems
+
+                        Because the compiler supports several different
+                        operating systems, is important to take a few
+                        precautions so that your code will execute correctly on
+                        all systems.
+                          • File sharing is implemented differently on
+                        different operating systems, so opening already opened
+                        files may fail on some operating systems (such as
+                        Windows). The only correct way to make sure to have the
+                        same file sharing behavior is to use the I/O routines
+                        provided by the sysutils unit.
+                          • Clean up at the end of your program, i.e. close all
+                        files on exit, and release all allocated heap memory,
+                        as some operating systems do not like it when some
+                        things are left allocated or opened.
+                          • Some operating systems limit the stack space that
+                        can be allocated, therefore it is important to limit
+                        subroutine nesting, and the number of local variables.
+                        Limiting total stack space usage at a given moment to
+                        at most 256 KBytes will make porting easier.
+                          • Do not hardcode paths to files, try to use relative
+                        paths instead
+                          • Use the following constants (defined in the system
+                        unit) to get information on files, line endings, and to
+                        build paths:
+                          □ LineEnding : Indicates the characters which end a
+                        text line
+                          □ LFNSupport : Indicates if long filenames are
+                        supported (more than 8.3 characters)
+                          □ DirectorySeparator : The character or characters
+                        that separate path components
+                          □ DriveSeparator : The character that separates the
+                        drive specification from the rest of the path
+                          □ PathSeparator : The character that separates
+                        directories in the path lists (such as the search path)
+                          □ FileNameCaseSensitive : Boolean indicating if the
+                        filenames for this system may be case-sensitive or not
+                          □ AllFilesMask : String containing a wildcard
+                        expression for all files
+                        It is also possible to use the PathDelim, PathSep and
+                        DriveDelim constants defined in the sysutils unit.
+
+                         3. Compiling Delphi code using Free Pascal
+
+                        The compiler supports Delphi-style classes. Make sure
+                        you use the -S2 or -Sd command line switches (see the
+                        manuals for the meaning of these switches), or add
+                        {$mode objfpc} or {$mode delphi} to your source code.
+                        For a list of Delphi incompatibilities also check the
+                        manual.
+                         4. Building a unit
+
+                        It works like in Turbo Pascal. The first keyword in the
+                        file must be UNIT (not case sensitive). The compiler
+                        will generate two files: XXX.PPU and XXX.O. The PPU
+                        file contains the interface information for the
+                        compiler and the O-file the machine code (an object
+                        file, whose precise structure depends on the assembler
+                        you used). To use this unit in another unit or program,
+                        you must include its name in the USES clause of your
+                        program.
+                         5. Compiling the system unit
+
+                        To recompile the system unit, it is recommended to have
+                        GNU make installed. typing 'make' in the rtl source
+                        directory will then recompile all RTL units including
+                        the system unit. You may choose to descend into the
+                        directory of your OS (e.g. rtl/linux) and do a 'make'
+                        there.
+
+                        It is possible to do all this manually, but you need
+                        more detailed knowledge of the RTL tree structure for
+                        that.
+                         6. How does function overloading work?
+
+                        Here is a procedure overloading example in FPC or
+                        ObjFPC mode:
+
+                                            procedure a(i : integer);
+                                            begin
+                                            end;
+
+                                            procedure a(s : string);
+                                            begin
+                                            end;
+
+                                            begin
+                                                a('asdfdasf');
+                                                a(1234);
+                                            end.
+
+
+                        You must be careful. If one of your overloaded
+                        functions is in the interface part of your unit, then
+                        all overloaded functions must be in the interface part.
+                        If you leave one out, the compiler will complain with a
+                        'This overloaded function can't be local' message.
+                        Overloaded functions must differ in their parameters;
+                        it is not enough if only their return types are
+                        different.
+                         7. Calling C functions
+
+                        It is possible to call functions written in C and
+                        compiled by the GNU C compiler (GCC). E.g., for calling
+                        the C function strcmp, declare the following (the cint
+                        type is declared in the ctypes unit):
+
+                        function strcmp(s1 : pchar;s2 : pchar) : cint;cdecl;external;
+
+                         8. Integrated Assembler syntax
+
+                        The default assembler syntax (AT&T style) is different
+                        from the one in Borland Pascal (Intel style). FPC
+                        however supports both styles. See the documentation for
+                        more info on how to use different assembler styles.
+
+                        A description of the AT&T syntax can be found in the
+                        GNU Assembler documentation.
+                         9. Unit system not found errors
+
+                        System is Pascal's base unit and is implicitly used by
+                        all programs. This unit defines several standard
+                        procedures and structures, and must be found to be able
+                        to compile any Pascal program by FPC.
+
+                        The location of the system and other unit files is
+                        passed on to the compiler by the -Fu switch. This
+                        switch can be specified on the command line, but is
+                        usually located in the fpc.cfg configuration file.
+
+                        If the compiler cannot find this unit, there are three
+                        possible causes:
+                         1. The fpc.cfg file is not in the same directory as
+                        the compiler executable (msdos,go32v2, win32 and OS/2)
+                        or cannot be found as "/etc/fpc.cfg" or ".fpc.cfg" in
+                        your homedirectory (UNIX platforms).
+                         2. The fpc.cfg file does not contain the -Fu
+                        parameter, or a wrong one. See the build faq (PDF),
+                        especially the chapters about the fpc.cfg and the
+                        directory structure.
+                         3. The unit files ARE found, but are the wrong version
+                        or for a different platform. Correct fpc.cfg to point
+                        to the right versions or reinstall the right versions
+                        (this can e.g. happen if you try to use a snapshot
+                        compiler while the -Fu statement in the used fpc.cfg
+                        still points to the RTL that came with the official
+                        release compiler).
+
+                        A handy trick can be executing "fpc programname -vtu".
+                        This will show where the compiler is currently looking
+                        for the unit files. You might want to pipe this through
+                        more (Dos, OS/2, Windows) or less (UNIX), since it can
+                        generate more than one screen information:
+
+                                            Dos, OS/2, Windows: fpc programname -vt |more
+
+                                            UNIX, Linux: fpc programname -vt |less
+
+
+
+                        10. There is a new language extension that would be
+                        really useful. Will you include it?
+
+                        Occasionally somebody asks for a new language extension
+                        on the maillist, and the discussions that follow have a
+                        recurring pattern. An extension is quite a big deal for
+                        the FPC team, and there are some criteria that are used
+                        to select if an extension is "worth" the trouble. The
+                        most important pre-selection criteria are:
+                         1. Compatibility must not be compromised in any way.
+                        Existing codebases on at least the Pascal level must
+                        keep running. This is often more difficult than most
+                        people think.
+                         2. The extension must have real value. Anything that
+                        is only a shorter notation does not apply, unless it is
+                        out of compatibility with an existing Pascal/Delphi
+                        codebase. Practically it means it must make something
+                        possible that cannot be done otherwise or be a
+                        compatibility item
+                         3. The change must fit in with the scope of the
+                        project: implementing a Pascal compiler with support
+                        for RAD and a generic DB system. This excludes features
+                        like inline SQL, and large garbage collected object
+                        frameworks.
+                        Exceptions to the second rule are sometimes made for
+                        platform-specific reasons (e.g. interfacing to some
+                        other language or OS). The first rule is often a
+                        problem, because issues are not easily recognizable
+                        unless one has tried to make extensions before. Best is
+                        to make a thoroughly written proposal that the
+                        developers can review, including
+                          • an explanation of the feature
+                          • why it is needed, what does it make possible?
+                          • how you would implement it?
+                          • many examples of typical use, and tests for
+                        possible problem cases
+                        Try to be verbose and really try to view this from the
+                        viewpoint of somebody who has to implement it, and try
+                        to make examples that span multiple units and
+                        procedures, and review what happens. Be critical, try
+                        to punch holes in your own reasoning and find possible
+                        problematic cases, and document them.
+
+                        Besides these pre-selection rules and documentation,
+                        the other important question is who is going to do the
+                        work. Keep in mind that the FPC developers are
+                        volunteers with todo-lists that are booked till the
+                        next decade. You cannot expect they will drop
+                        everything from their hands and implement the feature
+                        because you need it urgently, or think it is nice. If
+                        you are not willing to implement it yourself, submit
+                        patches and maintain it in the future, chances are
+                        slim. Remarks as "this will attract a lot of users
+                        because..." are considered with a lot of scepticism,
+                        since that applies to any new development.
+                            Runtime library related information
+
+                         1. Why do I get wrong colours when using the graph
+                        unit?
+
+                        If you use detect as graphdriver, you will end up with
+                        the highest supported bitdepth. Since the graph unit
+                        currently only supports up to 16 bits per pixel modes
+                        and since this bitdepth is supported by virtually all
+                        graphics cards, you will most likely get a 16 bit mode.
+
+                        The main problem is that in 16 (and 15, 24, 32, ...)
+                        bit modes, the colors are not set anymore using an
+                        index in a palette (the palettized way is called
+                        "indexed color"). In these modes, the color number
+                        itself determines what color you get on screen and you
+                        can not change this color. The color is encoded as
+                        follows (for most graphics cards on PC's at least):
+                          • 15 bit color: lower 5 bits are blue intensity, next
+                        come 5 bits of green and then 5 bits of red. The
+                        highest bit of the word is ignored.
+                          • 16 bit color: lower 5 bits are blue intensity, next
+                        come *6* bits of green and then 5 bits of red.
+
+                        This means that either you have to rewrite your program
+                        so it can work with this so-called "direct color"
+                        scheme, or that you have to use D8BIT as graphdriver
+                        and DetectMode as graphmode. This will ensure that you
+                        end up with a 256 (indexed) color mode. If there are no
+                        256 color modes supported, then graphresult will
+                        contain the value GrNotDetected after you called
+                        InitGraph and you can retry with graphdriver D4BIT.
+                         2. File sharing and file locks
+
+                        The standard runtime library file I/O routines open
+                        files in the default sharing mode of the operating
+                        system (system, objects units). Because of this, you
+                        might get problems if the file is opened more than once
+                        either by another process or the same process.
+
+                        Generally the behaviors for the different operating
+                        systems are as follows :
+                          • UNIX systems : There is no verification at all.
+                          • Windows : An access denied error will be reported.
+                          • DOS / OS/2 : If the file is opened more than once
+                        by the same process, no errors will occur, otherwise an
+                        access denied error will be reported.
+
+                        There are two ways to solve this problem:
+                          • Use specific operating system calls (such as file
+                        locking on UNIX systems) to get the correct behavior.
+                          • Use the sysutils unit or the Free Component Library
+                        TFileStream File I/O routines, which try to simulate,
+                        as much as possible, file sharing mechanisms.
+                         3. File denied errors when opening files with reset
+
+                        Trying to open files using reset on non-text files
+                        might cause a Runtime Error 5 (Access denied).
+
+                        All files opened using the above system unit routine
+                        use the current filemode value to determine how the
+                        file is opened. By default, filemode is set to 2 (Read/
+                        Write access).
+
+                        So, a call to reset on non-text files does not indicate
+                        that the file will be opened read-only. So, trying to
+                        open a file using reset with the defaults will fail on
+                        read-only files. filemode should be set to 0 (Real-only
+                        access) before calling reset to solve this problem. A
+                        sample solution is shown below.
+
+                                      const
+                                         { possible values for filemode }
+                                         READ_ONLY = 0;
+                                         WRITE_ONLY = 1;
+                                         READ_WRITE = 2;
+                                      var
+                                         oldfilemode : byte;
+                                         f: file;
+                                      begin
+                                         assign(f,'myfile.txt');
+                                         oldfilemode := filemode;
+                                         { reset will open read-only }
+                                         filemode := READ_ONLY;
+                                         reset(f,1);
+                                         { restore file mode value }
+                                         filemode := oldfilemode;
+                                         // ...
+                                         close(f);
+                                      end.
+
+
+                        For more information, consult the Free Pascal reference
+                        manual
+                            Windows-related information
+
+                         1. Releasing software generated by the windows
+                        compiler
+
+                        There is no special requirements for releasing software
+                        for the Windows platform, it will work directly out of
+                        the box. The following are default for the Windows
+                        platform:
+                          • Stack size is unlimited
+                          • The stack checking option is not available on this
+                        platform.
+
+                         2. Debugging
+
+                        The GNU debugger v6.4 and later have been tested, and
+                        generally work as they should. Because the GNU debugger
+                        is C oriented, some pascal types might not be
+                        represented as they should. It is suggested to use the
+                        text mode IDE instead of GDB, which is available for
+                        windows targets.
+
+                         3. Dynamic libraries
+
+                        Creation and use of shared libraries (also called
+                        dynamic link libraries) is fully supported by the
+                        compiler. Refer to the Programmer's Reference Manual
+                        for more information on shared library creation and
+                        use.
+                         4. Profiling
+
+                        Profiling is supported using gprof. It requires mingw
+                        to be installed, and that fpc.cfg points to the correct
+                        library paths.
+                         5. Graph and problems with keyboard, mouse and "dummy
+                        dos windows"
+
+                        Problem:
+                          • If you use the Graph unit under Win32, you cannot
+                        use the API mouse unit for mouse support or use the
+                        win32 Crt unit to get keyboard data. The reason for
+                        this is that the created window is a GUI window, and
+                        not a console one.
+                        Solution:
+                          • Use units WinMouse and WinCrt instead.
+
+                        Problem:
+                          • When you follow the above advice, and you run your
+                        purely Graph based win32 program from the RUN menu in
+                        windows, a dummy dos window is opened.
+                        Solution:
+                          • Set the application type to GUI:
+
+                        {$apptype GUI}
+
+                        and put this line before your programs InitGraph
+                        statement:
+
+                        ShowWindow(GetActiveWindow,0);
+
+
+                        This will hide the dos window window.
+
+                        Some of the demos (like fpctris) use these techniques
+                         6. Cygwin binary directory in your path sometimes
+                        causes builds to fail
+
+                        The mingw make tool seems to look for a "sh.exe", which
+                        it finds when the cygwin binary directory is in the
+                        path. The way directories are searched changes, and the
+                        build process dies.
+
+                        Solution: do not put cygwin in your global path for
+                        now, only add it when needed. Efforts are made to work
+                        around this.
+
+                        Possible untested workaround: add mingw sh.exe to a
+                        directory before the cygwin binary directory in the
+                        path
+                         7. Using the DOS compiler under Windows 95
+
+                        There is a problem with the DOS (GO32V2) compiler and
+                        Windows 95 on computers with less than 16 Megabytes of
+                        RAM. First set in the properties of the DOS box the
+                        DPMI memory size to max value. Now try to start a demo
+                        program in the DOS box, e.g. HELLO (starting may take
+                        some time). If this works you will be able to get the
+                        compiler to work by recompiling it with a smaller heap
+                        size, perhaps 2 or 4 MB (option -Chxxxx).
+                         8. Using DOS generated applications under windows
+
+                        Several problems have been found running DOS software
+                        under certain versions of 32-bit MS Windows (NT / 2000
+                        / XP). These seem to be problems with the DOS emulation
+                        layers (emulated DPMI services or the Go32 extender).
+                        These problems may not occur with all software
+                        generated by FPC. Either applications should be tested
+                        on these systems before being released, or Windows
+                        versions should be generated instead. Note that no DOS
+                        applications may be used under 64-bit versions of MS
+                        Windows - this is a general restriction due to DOS
+                        emulation not being provided for these MS Windows
+                        versions. You might be able to use these applications
+                        under DosBox emulation, but it is not officially
+                        supported / tested by the FPC team.
+                         9. The mouse cursor does not respond in the Windows
+                        IDE
+
+                        In windowed mode, the IDE might not respond to mouse
+                        moves and clicks. Just change the properties of the
+                        console, and remove the quick edit mode option. This
+                        should solve the mouse response problems.
+                            UNIX-related information
+
+                        This section also applies to most UNIX variants, such
+                        as Linux, FreeBSD and Mac OS X.
+                         1. Releasing software generated by the UNIX compilers
+
+                          • There is no stack space usage limit.
+                          • Stack checking is simulated.
+                          • Minimal operating system versions :
+                          □ Linux : Kernel v2.4.x or later.
+                          □ FreeBSD : version 5.x or later. (4.x can be made to
+                        work with minor work)
+                          □ NetBSD : version 1.5 or later.
+                          □ Solaris : version 5.7 of SunOS or later (should
+                        work with earlier versions, but untested).
+                          □ Mac OS X : version 10.4 or later (Intel), or 10.3.9
+                        or later (PowerPC)
+
+                         2. Debugging
+
+                        The GNU debugger v6.5 and later have been tested, and
+                        generally work as they should. Because the GNU debugger
+                        is C oriented, some pascal types might not be
+                        represented as they should.
+
+                         3. Dynamic libraries
+
+                        Creating dynamic libraries under UNIX-like operating
+                        systems is supported.
+
+                        Importing code from shared libraries does work as
+                        expected though, since it does not require usage of
+                        position independant code.
+                         4. Profiling
+
+                        Profiling is supported using gprof under linux, FreeBSD
+                        and NetBSD, the latter two only since 1.0.8. On other
+                        other UNIX-like operating systems, profiling is
+                        currently not supported.
+                         5. Libc is missing on platforms other than Linux/i386
+
+                        Libc is a Kylix compatibility unit. Because it contains
+                        many i386 specific code and features structures from
+                        legacy kernels, it has not been made available on other
+                        platforms.
+
+                        To access UNIX functionality, please use units like
+                        baseunix and unix.
+                         6. Why can't the linker find "vga"?
+
+                        This error typically looks like this:
+
+                                         Free Pascal Compiler version 3.0.x [xxxx/yy/zz] for i386
+                                         Copyright (c) 1993-2008 by Florian Klaempfl
+                                         Target OS: Linux for i386
+                                         Compiling test.pp
+                                         Assembling test
+                                         Linking test
+                                         /usr/bin/ld: cannot find -lvga
+                                         test.pp(6,4) Warning: Error while linking Closing script ppas.sh 5 Lines
+                                         compiled, 0.2 sec
+
+
+                        This error is not an error in the installation of FPC
+                        or FPC itself, but a missing Svgalib library in your
+                        UNIX install. Please install the required library using
+                        your favourite package manager tool
+                         7. Compiler indicates missing as and ld
+
+                        Normally UNIX systems have the assembler (as) and
+                        linker (ld) pre-installed and already in the search
+                        path. That is the reason why these tools are not
+                        supplied with the compiler.
+
+                        If the compiler cannot find these tools, either they
+                        are not in your search path, or they are not installed.
+                        You should either add the path where the tools are
+                        located to your search path, and / or you should
+                        install these tools.
+                         8. link.res syntax error, or "did you forget -T?"
+
+                        There was a bug in GNU LD 2.19 that caused it to crash
+                        when processing FPC-generated linker scripts. This bug
+                        has been fixed in GNU LD 2.19.1.
+
+                        At the same time, LD has been modified to emit a
+                        warning of the form
+
+                                       /usr/bin/ld: warning: link.res contains output sections; did you forget -T?
+
+
+                        FPC 3.1.1 and later by default generate a different
+                        kind of linker script that no longer triggers this
+                        warning. Unfortunately, this is only possible by making
+                        use of functionality that is unavailable before GNU LD
+                        2.19. Earlier versions therefore now complain about a
+                        syntax error in link.res. The new -X9 compiler command
+                        line parameter can, however, be used to generate linker
+                        scripts that are compatible with pre-2.19 linker
+                        versions.
+
+                        Their is no way to remove the -T warning with earlier
+                        FPC versions, but it should not result in any problems.
+
+                            OS/2-related information
+
+                         1. Releasing software generated by the OS/2 compiler
+
+                        The OS/2 compiler version 1.0.x and before is based on
+                        EMX, therefore it should work both on OS/2 and on
+                        vanilla DOS systems. In version 1.9.x and above this
+                        functionality is preserved in newly added target EMX,
+                        whereas binaries for target OS2 can only run under real
+                        OS/2. The following notes apply to OS2 target in 1.0.x
+                        and EMX in 1.9.x and above:
+                          • All applications generated for the OS/2 (EMX)
+                        target require the EMX 0.9d (or later) runtime files to
+                        run. These files should be redistributed with your
+                        software. All the files which should be redistributed
+                        are included in emxrt.zip
+                          • Under OS/2, LIBPATH should be modified to add the
+                        EMX DLL paths. Otherwise, programs will not run and
+                        will abort with an error 'Cannot find EMX.dll'.
+                          • Stack can grow up to 256 Kbytes by default. This
+                        can be changed by the user or developper using the
+                        emxstack or emxbind utilities.
+
+                         2. Debugging
+
+                        The GNU debugger v4.16 (EMX port) has been tested
+                        (including its PM add-on, pmgdb.exe) and generally
+                        works as it should. Because the GNU debugger is C
+                        oriented, some pascal types might not be represented
+                        correctly.
+
+                         3. Dynamic libraries
+
+                        Even though this operating system permits the creation
+                        and usage of shared libraries (also called dynamic link
+                        libraries), the compiler currently only permits
+                        importing routines from dynamic libraries (creation of
+                        dynamic libraries is unsupported).
+                         4. Profiling
+
+                        Profiling is currently not supported for this platform.
+                         5. Using DOS generated applications under OS/2
+
+                        It has been reported that some DOS (GO32V2)
+                        applications (including the DOS compiler itself)
+                        generated by the compiler fail on some OS/2
+                        installations. This is due to problems in the OS/2 DPMI
+                        server.
+
+                        You should use native OS/2 applications under OS/2
+                        (including the native OS/2 compiler) or try installing
+                        a new OS/2 fixpack to see if it solves the problem.
+                         6. INSTALL.EXE of version 1.0.6 or below fails with an
+                        unknown error (-1) under OS/2
+
+                        or
+
+                        INSTALL.EXE of version 1.0.6 or above complains about
+                        missing TZ variable under OS/2
+
+                        You are most probably using an older version of OS/2
+                        (like OS/2 Warp 3.0) and do not have TZ variable in
+                        your environment. The easiest solution is to add "SET
+                        TZ=..." (e.g. "SET TZ=
+                        CET-1CEST,3,-1,0,7200,10,-1,0,10800,3600" for most of
+                        western and central Europe) line to your CONFIG.SYS,
+                        and restart OS/2. The proper setting for you can be
+                        found e.g. using the TZCALC tool from TIME868 package.
+                         7. OS/2 compiler not working after upgrading to 1.9.6
+                        or newer
+
+                        An updated version of GNU assembler (as.exe) is
+                        packaged with release 1.9.6 (newer version was
+                        necessary to get support for features of modern CPUs).
+                        This version of the GNU tool was created with Innotek
+                        port of GNU C and relies on its libc. This results in
+                        higher limitations regarding supported configurations,
+                        because this libc needs recent version of OS/2 Unicode
+                        support libraries (LIBUNI.DLL and UCONV.DLL) not
+                        available in base OS/2 Warp 3.0 and OS/2 Warp 4.0. The
+                        updated versions were distributed by IBM in corrective
+                        packages (fixpaks) - see e.g. WarpUpdates site for
+                        information about OS/2 fixpaks and links for
+                        downloading them. This issue isn't valid for WarpServer
+                        for e-Business, MCP and eComStation - these already
+                        have the correct version.
+                         8. Compilation under OS/2 fails with error "Can't call
+                        the assembler"
+
+                        Apart from the point mentioned above, there is at least
+                        one more potential reason for issues with executing the
+                        assembler and resulting in error message "Can't call
+                        the assembler, error 2 switching to external
+                        assembling". This error may be result of the OS/2
+                        system not being able to find DLLs required for the
+                        assembler. Make sure that you installed FPC completely
+                        (these DLLs are part of file asldos2.zip) and that you
+                        have set LIBPATH according to instructions in
+                        README.TXT (and restarted afterwards). If in doubts,
+                        running the assembler directly from the command line
+                        (e.g. "as --version" to show the installed as.exe
+                        version) may be helpful to see name of the missing
+                        dynamic library or other details about the problem.
+                            BeOS-related information
+
+                         1. Releasing software generated by the BeOS compiler
+
+                        Software generated for the BeOS target will only work
+                        on the Intel based version of BeOS.
+                          • The target system must have at least BeOS v4.0 or
+                        later (BeOS 5.1d 'Dano' is not supported)
+                          • Stack size is set to 256 Kbytes. This cannot be
+                        changed
+
+                         2. Debugging
+
+                        Debugging works with the system-supplied gdb version.
+
+                         3. Dynamic libraries
+
+                        Even though this operating system permits the creation
+                        and usage of shared libraries (also called dynamic link
+                        libraries), the compiler currently only permits
+                        importing routines from dynamic libraries (creation of
+                        dynamic libraries is unsupported).
+                         4. Profiling
+
+                        Profiling is currently not supported for this platform.
+                         5. BeOS Linking problems
+
+                        It has been reported that certain versions of the
+                        linker that shipped with some versions of BeOS are
+                        broken. If you get an error when linking fpc
+                        applications, try updating your version of ld from the
+                        following site.
+
+                            DOS-related information
+
+                         1. Releasing software generated by the DOS compiler
+
+                          • If your program uses floating point code (which is
+                        very probable), make sure to read "Applications created
+                        with Free Pascal crash on 80386 systems" regarding
+                        special issues which might occur. Math coprocessor
+                        emulation software is then required (wmemu387.dxe
+                        should be redistributed with your software)
+                          • The target system must have a DPMI server. To avoid
+                        problems, the file cwsdpmi.exe should always be
+                        redistributed with your application
+                          • The target system must have DOS 3.3 or later
+                          • The default stack size is 256 Kbytes. See also "
+                        Changing the default stack size"
+                          • The stack checking option is available on this
+                        platform.
+
+                         2. Debugging
+
+                        The GNU debugger v4.16 and later have been tested, and
+                        generally work as they should. Because the GNU debugger
+                        is C oriented, some pascal types might not be
+                        represented as they should. It is suggested to use the
+                        text mode IDE instead of GDB, which is available for
+                        the DOS target.
+
+                         3. Dynamic libraries
+
+                        Creation or use of shared libraries (also called
+                        dynamic link libraries) is not supported under this
+                        platform.
+                         4. Profiling
+
+                        Profiling with gprof is supported for this platform.
+                         5. Running Free Pascal without a math coprocessor
+
+                        On the Intel version the emulator is automatically
+                        loaded by the compiler if you add the following
+                        commands to your autoexec.bat:
+
+                                            SET 387=N
+                                            SET EMU387=C:\PP\BIN\GO32V2\WEMU387.DXE
+
+
+                        (do not forget to replace the C:\PP with the directory
+                        where you installed FPC)
+                         6. Applications created with Free Pascal crash on
+                        80386 systems
+
+                          • Trying to run an application which performs
+                        floating point operations on a 386 system without a
+                        math co-processor will crash unless the emu387 unit is
+                        used, as this unit loads the math co-processor emulator
+                        (called wmemu387.dxe). You can add the unit as follows:
+
+                                                program myprog;
+                                                uses emu387, ...
+
+
+                        When the application is released, the software package
+                        should also include the wmemu387.dxe redistributable
+                        file to avoid problems. .
+                          • Some 80386 systems have a hardware bug which
+                        corrupt the accumulator register EAX if it is used in a
+                        MOV instruction just after a POPAL instruction. Prior
+                        to version 1.0.5, the compiler and runtime library
+                        could generate such code sequences. This is now fixed
+                        and should no longer cause problems
+
+                         7. The mouse cursor is not visible in graphics screens
+
+                        Many DOS mouse drivers do not properly support mouse
+                        cursors in VESA modes. Logitech is said to have a
+                        decent mouse driver, which can be found here
+                         8. Accessing I/O ports
+
+                        The Port array is supported like in TP, as long as you
+                        use the ports unit in your program (not available under
+                        Win32).
+
+                        I/O port access is possible under Linux, but that
+                        requires root privileges. Check the manuals for the
+                        IOPerm, ReadPort and WritePort procedures. (Unit Linux)
+                         9. Accessing DOS memory / Doing graphics programming
+
+                        You can do like in Turbo Pascal, via absolute or mem[].
+                        For larger memory blocks use the dosmemput/dosmemget
+                        routines in the Go32 unit.
+                        10. Changing the default stack size
+
+                        Under the DOS (GO32V2) target, the default stack size
+                        to 256 bKbytes. This can be modified with a special
+                        DJGPP utility called stubedit. It is to note that the
+                        stack may also be changed with some compiler switches,
+                        this stack size, if greater then the default stack size
+                        will be used instead, otherwise the default stack size
+                        is used.
 
diff --git a/install/doc/readme.txt b/install/doc/readme.txt
index e30b446d..3f8f655e 100644
--- a/install/doc/readme.txt
+++ b/install/doc/readme.txt
@@ -1,7 +1,7 @@
 
                             Free Pascal Compiler
 
-                               Version 3.2.0
+                               Version 3.2.4
 
 ****************************************************************************
 * Introduction
@@ -16,12 +16,13 @@ also partial support for the Macintosh pascal dialect.
 
 News and changes related to this release are described in whatsnew.txt.
 
-Free Pascal 3.2.0 is currently available for the following platforms:
+Free Pascal 3.2.4 is currently available for the following platforms:
 - Linux-i386
 - Linux-x86_64 (amd64)
 - Linux-powerpc
 - Linux-sparc
 - Linux-ARM
+- Linux-Aarch64
 - Win32-i386 (2000/XP, WinNT or later)
 - Win64-x86_64 (XP or later)
 - Wince-ARM (cross compiled from win32-i386)
@@ -29,6 +30,7 @@ Free Pascal 3.2.0 is currently available for the following platforms:
 - FreeBSD-x86_64
 - Mac OS X/Darwin for PowerPC (32 and 64 bit)
 - Mac OS X/Darwin for Intel (32 and 64 bit)
+- Mac OS X/Darwin for AArch64/ARM64
 - iOS (ARM and AArch64/ARM64) and iPhoneSimulator (32 and 64 bit)
 - OS/2-i386 (OS/2 Warp v3.0, 4.0, WarpServer for e-Business and eComStation)
 - Haiku-i386
@@ -38,7 +40,7 @@ Free Pascal 3.2.0 is currently available for the following platforms:
 - Nintendo Wii-powerpc (cross compile from win32-i386)
 - AIX 5.3 and later for PowerPC (32 and 64 bit)
 - Java JVM (1.5 and later) and Android Dalvik (Android 4.0 and later)
-- Android (AArch64, ARM, i386, MIPS) via cross-compiling.
+- Android (AArch64, x86_64, ARM, i386, MIPS) via cross-compiling.
 - MSDos-i8086 (cross compiled from win32-i386 or Linux) 
 - Amiga, MorphOS and AROS
 
@@ -71,12 +73,17 @@ e-mail addresses are listed below.
   - variant support
   - inlining
 - code optimizer:
-  - peephole optimizer (80x86 only)
+  - peephole optimizer
   - jump optimizer
-  - loading of variables into registers
-  - assembler level dataflow analyzer (80x86 only)
+  - register variables
   - stack frame eliminations
   - sophisticated register allocator
+  - common subexpression elimination
+  - constant folding
+  - constant propagation
+  - loop unrolling
+  - data structure recording 
+  - fast math
 - integrated BASM (built-in assembler) parser
   - supports ATT syntax used by GNU C
   - supports Intel syntax used by Turbo Pascal (x86-only)
@@ -106,12 +113,12 @@ e-mail addresses are listed below.
 ****************************************************************************
 
 Processor:
-  i386, x86_64, PowerPC, ARM, MIPS, i8086, Motorola 68k, Sparc or JVM 
-  runtime
+  i386, x86_64, PowerPC, PowerPC64, ARM, MIPS, i8086, Motorola 68k, 
+  Aarch64 aka ARM64, AVR, Sparc or JVM runtime
 Win32:
  - MS Windows NT/2000/XP or later (Win95, 98 and ME are not supported
    in FPC officially any longer).
- - 16 MB RAM
+ - 128 MB RAM
 OS/2:
  - OS/2 Warp v3.0 with one of late fixpaks - FP 35 should be fine,
    OS/2 Warp v4.0 with FP 5 and above, WSeB, MCP or any eComStation version
@@ -134,12 +141,12 @@ Mac OS X:
 * Quick start - Win32
 ****************************************************************************
 
-Download the distribution package (fpc-3.2.0.i386-win32.exe) and run it
+Download the distribution package (fpc-3.2.4.i386-win32.exe) and run it
 - it is a self-extracting installer, so just follow the instructions
 to install it. The installer should set the PATH environment variable as
 appropriate.
 
-To test the compiler, change to the demo\texts directory of the FPC tree
+To test the compiler, change to the demo\text directory of the FPC tree
 and type on the command line:
         fpc hello
         hello
@@ -149,11 +156,25 @@ and type on the command line:
 * Quick start - DOS
 ****************************************************************************
 
-Download distribution archive (dos320.zip for GO32v2) and unzip it into
-a temporary directory.
+Download distribution archive for GO32v2 (either the basic dos324.zip, or
+dos324full.zip containing also the sources) and unzip it into a temporary
+directory.
 
 Start the install program INSTALL.EXE and follow the instructions.
 
+Note that some files and directories have names longer than 8.3 limit
+existing with the traditional / legacy FAT16 format without the VFAT
+extensions. In this context, it's worth mentioning that you should prefer to
+use LFN-enabled environment whenever possible. However, FPC may be used (not
+built from its own sources!!!) even in environments not providing support
+for long file names (LFN). If you are in such a situation, you should be
+aware that files containing longer file names are not selected in the
+installer by default if LFN support is not detected. Among others, this
+includes the basic package containing the compiler and RTL - you should make
+sure to select at least this package, but preferably also some other like
+package rtl-console, which contains legacy TP/BP compatibility unit Crt,
+among others.
+
 Don't forget to set PATH as mentioned by the install program. If running
 under plain DOS, this can be done by opening file named AUTOEXEC.BAT located
 in the root directory of your boot drive (usually C:\) with a plain text
@@ -162,7 +183,7 @@ insensitive) with path to newly installed binaries (installation root as
 selected in the installation program appended with "\BIN\GO32v2") and save
 it.
 
-To test the compiler, change to the demo\texts directory of the FPC tree
+To test the compiler, change to the demo\text directory of the FPC tree
 and type
         fpc hello
         hello
@@ -172,11 +193,21 @@ and type
 * Quick start - OS/2 / eComStation / ArcaOS
 ****************************************************************************
 
-Download distribution archive (os2320full.zip or os2320.zip for OS/2,
-eComStation or ArcaOS) and unzip it into a temporary directory.
+Download distribution archive for OS/2, eComStation or ArcaOS (either
+os2324full.zip containing also the source files, or the basic os2324.zip)
+and unzip it into a temporary directory.
 
 Start the install program INSTALL.EXE and follow the instructions.
 
+Note that some files and directories have names longer than 8.3 limit
+existing with the traditional / legacy FAT16 format. Obviously, OS/2
+provides full support for longer file names with OS/2 applications when used
+on more efficient filesystems like JFS or HPFS, or even with FAT32. However,
+OS/2 still provides the possibility to use the legacy FAT16 as well. We do
+not recommend installing FPC to partitions formatted as FAT16, but it is
+possible, albeit with certain limitations (among others, FPC itself may not
+be built from its own sources in such case).
+
 Don't forget to set PATH and LIBPATH as mentioned by the install program.
 This can be done by opening file named CONFIG.SYS located in the root
 directory of your boot drive (e.g. C:\) with a plain text editor (e.g.
@@ -187,7 +218,7 @@ PATH and "\DLL" for LIBPATH) and save it again as a plain text file.
 Note that changes to LIBPATH require restart of your machine in order to come
 into effect.
 
-To test the compiler, change to the demo\texts directory of the FPC tree
+To test the compiler, change to the demo\text directory of the FPC tree
 and type
         fpc hello
         hello
@@ -197,11 +228,11 @@ and type
 * Quick start - Linux/FreeBSD
 ****************************************************************************
 
-Download fpc-3.2.0.<cpu>-<os>.tar and untar into a temporary directory.
+Download fpc-3.2.4.<cpu>-<os>.tar and untar into a temporary directory.
 
 Start the install script with ./install.sh and follow the instructions.
 
-To test the compiler, change to the demo/texts directory of the FPC tree
+To test the compiler, change to the demo/text directory of the FPC tree
 and type
         fpc hello
         hello
@@ -248,10 +279,14 @@ ftp://ftp.freepascal.org/fpc/dist/docs-pdf/, other formats are available
 for download in the directory of the respective distributed release.
 
 NB that there is at present no FPC specific documentation for the platform
-specific API (like Win32 system functions, etc.). There is a note in the ftp
-/doc explaining where MS help file documenting Win32 API can be obtained,
-other platforms (especially Unix-based ones) often come with this
-documentation included in system installation.
+specific API (like Win32 system functions, etc.). There is a link to
+documentation of Win32/Win64 API provided by MS on page "More information"
+available on the FPC web site (see below), other platforms (especially
+Unix-based ones) often come with this documentation included in system
+installation.
+
+The page "More information" contains also references to other 3rd party
+resources, including general Pascal tutorials, etc.
 
 
 ****************************************************************************
@@ -261,7 +296,7 @@ documentation included in system installation.
 Suggestions, Help ...
 ---------------------
 e-mail: fpc-devel@lists.freepascal.org (bugs, developer related questions)
-e-mail: fpc-pascal@lists.freepascal.org (general pascal related questions)
+e-mail: fpc-pascal@lists.freepascal.org (general Pascal related questions)
 
 Both these adresses are for mailing lists. If you're not subscribed,
 be sure to mention this fact when sending questions to these lists,
@@ -284,7 +319,7 @@ SNAPSHOTS & SOURCES
 -------------------
 One of the features of FPC is the snapshots. These are made daily or weekly
 from the developers' latest versions of the source. Snapshots are available
-for GO32v2, Win32, OS/2 and Linux versions. The latest snapshots are in:
+for GO32v2, Win32 and Linux versions. The latest snapshots are in:
 ftp://ftp.freepascal.org/fpc/snapshot/ in appropriately named .zip/tar
 files.
 
@@ -312,6 +347,7 @@ a 200 MHz processor and at least 100 MB of free disk space. You'll also
 need some knowledge of makefiles & programming... it is not difficult but
 it isn't easy either!
 
+
 REPORTING BUGS
 ----------------
 If you find a bug in the released version, you may want to try a snapshot
@@ -371,6 +407,12 @@ downloaded from http://clio.rice.edu/cwsdpmi/.
 The DOS version (go32v2) contains some binaries of DJGPP. You can obtain
 the full DJGPP package at: http://www.delorie.com/djgpp/
 
+Similarly, the OS/2 version contains some binaries coming from the EMX
+port of GNU C/C++ and binutils, plus a later port of GNU 'as' performed
+outside of the FPC project. Both the EMX package and GCC binutils ports are
+available e.g. on http://web.archive.org/web/20240422064030/hobbes.nmsu.edu
+including their sources (under /pub/os2/dev/tools/toolkits/).
+
 NOTE: OS/2 version of the installer uses the library UNZIP32.DLL from
       Info-ZIP. Info-ZIP's software (Zip, UnZip and related utilities)
       is free and can be obtained as source code or executables from
diff --git a/install/doc/whatsnew.txt b/install/doc/whatsnew.txt
index 44766d3e..17546c81 100644
--- a/install/doc/whatsnew.txt
+++ b/install/doc/whatsnew.txt
@@ -1,3 +1,82 @@
+                            Free Pascal Compiler
+
+                                Version 3.2.4
+
+******************************************************************************
+
+Free Pascal 3.2.4 is a minor release of the 3.2.x fixes branch. As such, it
+contains mostly fixes of bugs discovered in the previous version, plus some
+updates for included packages.
+
+There are currently no known changes which might result in incompatibility with
+the previous version 3.2.2.
+
+The main highlights of this version:
+  * large number of issue and bug fixes
+  * FPC development switched to git, all tools adapted accordingly
+  * fixes to avoid year 2038 problem
+  * updated translations of compiler messages
+  * Issues with newer glibc fixed
+
+Platforms:
+  * Support for new AVR targets: megaAVR 0 and tinyAVR 0/1
+  * FreeBSD 12 support
+  * Darwin: made -gl working
+
+Utilities:
+  * FPDoc: markdown support
+  * fpcres: several improvements
+
+Packages:
+  * fcl-image improved, e.g. resolution support and orientation flag support
+  * fcl-base: thread pool support
+  * fcl-pdf: pdf reader
+  * vcl-compat significantly improved
+  * fcl-hash: new package containing hash and cryptography algorithm classes
+
+Free Vision:
+  * Small bug fixes
+
+IDE:
+  * Support long (+255 characters) source code lines
+  * On startup return to last directory
+  * Lot of small bug fixes, improved overall stability
+
+******************************************************************************
+
+                            Free Pascal Compiler
+
+                                Version 3.2.2
+
+******************************************************************************
+
+Free Pascal 3.2.2 is a minor release of the 3.2.x fixes branch. As such, it
+contains mostly fixes of bugs discovered in the previous version, plus some
+updates for included packages. In this case a new target was also backported
+from trunk.
+
+There are currently no known changes which might result in incompatibility to
+the previous version 3.2.0.
+
+The main highlights of this version:
+
+Platforms:
+  * New platform: aarch64-darwin
+  * A new 32/64-bit combined installer for Windows.
+
+Utilities:
+  * fpcres provides support for compiling resources from *.rc files
+
+Packages:
+  * fcl-db extended with support for MySQL 8.0
+  * fcl-passrc updates
+  * pas2js updates
+  * fpdoc updates
+  * fcl-base includes new support for logging to StdOut and StdErr
+  * rtl-extra includes improvements for Sockets
+
+
+******************************************************************************
 
                             Free Pascal Compiler
 
@@ -104,11 +183,11 @@ Some highlights are:
 
 Rtl:
   * TRect, TPoint and similar types are now type compatible between
-    Types and Windows unit, and are now advanced records. 
+    Types and Windows unit, and are now advanced records.
 
 Packages:
   * googleapi and fcl-pdf packages.
-  * fcl-db and web packages synchronized 
+  * fcl-db and web packages synchronized
   * unicode tables updated.
 
 See http://bugs.freepascal.org/changelog_page.php for the list of reported
@@ -291,7 +370,7 @@ Packages:
   * Many improvements to the database units (fcl-db)
   * Objective-Pascal interfaces to Foundation, AppKit, CoreData and WebCore
   * OpenGL headers updated to OpenGL 4.0
-  
+
 Details about these new features can be found at
 http://wiki.freepascal.org/FPC_New_Features_2.6.0
 
@@ -313,10 +392,10 @@ Some highlights are:
 
 Packages:
   * Many improvements to the XML units
-  * Many improvements to the database units. 
+  * Many improvements to the database units.
         * Specially sqlite got quite some fixes.
-  * Many improvements to the chm units. 
-        * Including a commandline CHM compiler 
+  * Many improvements to the chm units.
+        * Including a commandline CHM compiler
   * Many improvements to fppkg and fpmake for another round of testing.
 
 Platforms:
@@ -393,7 +472,7 @@ Compiler:
   * Fixes to the interface delegation (implements) support
   * Improved cpu register allocation
   * Improved ARM/EABI support
-  
+
 RTL:
   * Linearly scaling multi-threaded memory manager
   * Support for (advisory) file locking on Unix-based platforms
@@ -418,7 +497,7 @@ bugs which have been fixed in this release.
                               What's New in 2.2.4
 ******************************************************************************
 
-Free Pascal 2.2.4 contains many bug fixes and some new features. The 
+Free Pascal 2.2.4 contains many bug fixes and some new features. The
 main purpose of this release is to fix problems reported with FPC 2.2.2.
 
 Please also see http://wiki.freepascal.org/User_Changes_2.2.4 for a list
@@ -448,7 +527,7 @@ bugs which have been fixed in this release.
                               What's New in 2.2.2
 ******************************************************************************
 
-Free Pascal 2.2.2 contains many bug fixes and some new features. The 
+Free Pascal 2.2.2 contains many bug fixes and some new features. The
 main purpose of this release is to fix problems reported with FPC 2.2.0,
 and to remove all potentially tainted code from our source code base.
 
diff --git a/install/fpc-i8086-msdos-3.2.0rc1.spec b/install/fpc-i8086-msdos-3.2.2.spec
similarity index 86%
rename from install/fpc-i8086-msdos-3.2.0rc1.spec
rename to install/fpc-i8086-msdos-3.2.2.spec
index 508bc062..cacef40f 100644
--- a/install/fpc-i8086-msdos-3.2.0rc1.spec
+++ b/install/fpc-i8086-msdos-3.2.2.spec
@@ -1,6 +1,6 @@
 Name: fpc-i8086-msdos
-Version: 3.2.0
-Release: 0.rc1
+Version: 3.2.2
+Release: 1
 
 # Because this rpm is used on different systems, with different names
 # of packages/dependencies. Do not add dependencies automatically.
@@ -9,17 +9,16 @@ AutoReqProv: no
 ExclusiveArch: i386 i586 i686 ppc amd64 x86_64
 License: GPL and modified LGPL
 Group: Development/Languages
-Source0: fpcbuild-%{version}rc1.tar.gz
-Source1: make-i8086-msdos-unixpackage-%{version}rc1.sh
-Patch0: fpcbuild-3.2.0rc1-nowatcom.diff
+Source0: fpcbuild-%{version}.tar.gz
+Source1: make-i8086-msdos-unixpackage-%{version}.sh
 Summary: Free Pascal Compiler for i8086-msdos
 Packager: Nikolay Nikolov (nickysn@users.sourceforge.net)
 URL: http://www.freepascal.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fpc
+BuildRequires: fpc nasm glibc-devel make
 Requires: fpc
 
-%define fpcbuildsubdir fpcbuild-%{version}rc1
+%define fpcbuildsubdir fpcbuild-%{version}
 
 %define ppcname ppcross8086
 
@@ -45,13 +44,12 @@ utils. Provided units are the runtime library (RTL), free component library
 
 %prep
 %setup -c
-%patch0 -p0
 cp -p %SOURCE1 %{fpcbuildsubdir}
 
 %build
 
 cd %{fpcbuildsubdir}
-./make-i8086-msdos-unixpackage-%{version}rc1.sh
+./make-i8086-msdos-unixpackage-%{version}.sh
 
 %install
 rm -rf %{buildroot}
diff --git a/install/fpc.ist b/install/fpc.ist
index fbc296e2..6553a349 100644
--- a/install/fpc.ist
+++ b/install/fpc.ist
@@ -12,6 +12,7 @@
 ;
 [Setup]
 AppName=Free Pascal
+OutputBaseFilename=fpc-setup
 AppID=FreePascal
 AppVerName=Free Pascal %FPCVERSION%
 AppPublisher=Free Pascal Team
@@ -147,11 +148,10 @@ Source: bin\i386-win32\chmcmd.exe; DestDir: {app}\bin\i386-win32; Flags: ignorev
 Source: bin\i386-win32\fpcres.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
 Source: bin\i386-win32\yylex.cod; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
 Source: bin\i386-win32\yyparse.cod; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
-Source: units\i386-win32\utils-lexyacc\*.*; DestDir: {app}\units\i386-win32\utils-lexyacc; Flags: ignoreversion; Components: utils
 ; Demos
 Source: demo\*.*; DestDir: {app}\demo; Flags: ignoreversion recursesubdirs ; Components: demo
 ; Documentation
-%DisableDocs%Source: doc\*.pdf; DestDir: {app}\doc; Flags: ignoreversion; Components: docs
+%DisableDocs%Source: help\*.chm; DestDir: {app}\help; Flags: ignoreversion; Components: docs
 
 ; Units
 Source: units\i386-win32\*.*; DestDir: {app}\units\i386-win32; Flags: ignoreversion recursesubdirs; Components: units
@@ -168,12 +168,12 @@ Name: {userdesktop}\Free Pascal IDE; Filename: {app}\bin\i386-win32\fp.exe; comp
 Name: {group}\Free Pascal; Filename: {app}\bin\i386-win32\fp.exe; components: ide; IconFileName: {app}\bin\i386-win32\fp32.ico; WorkingDir: {app}\bin\i386-win32
 Name: {group}\{cm:ProgramOnTheWeb,Free Pascal}; Filename: {app}\Free Pascal.url; IconFileName: {app}\bin\i386-win32\fp32.ico;
 Name: {group}\{cm:UninstallProgram,Free Pascal}; Filename: {uninstallexe}
-%DisableDocs%Name: {group}\Documentation\User's manual; Filename: {app}\doc\user.pdf; Components: docs
-%DisableDocs%Name: {group}\Documentation\Programmer's manual; Filename: {app}\doc\prog.pdf; Components: docs
-%DisableDocs%Name: {group}\Documentation\Reference manual; Filename: {app}\doc\ref.pdf; Components: docs
-%DisableDocs%Name: {group}\Documentation\Run-Time Library Reference guide; Filename: {app}\doc\rtl.pdf; Components: docs
-%DisableDocs%Name: {group}\Documentation\Free Component Library Reference guide; Filename: {app}\doc\fcl.pdf; Components: docs
-%DisableDocs%Name: {group}\Documentation\Free Pascal code documenter Reference manual; Filename: {app}\doc\fpdoc.pdf; Components: docs
+%DisableDocs%Name: {group}\Documentation\User's manual; Filename: {app}\help\user.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Programmer's manual; Filename: {app}\help\prog.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Reference manual; Filename: {app}\help\ref.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Run-Time Library Reference guide; Filename: {app}\help\rtl.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Free Component Library Reference guide; Filename: {app}\help\fcl.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Free Pascal code documenter Reference manual; Filename: {app}\help\fpdoc.chm; Components: docs
 
 [UninstallDelete]
 Type: files; Name: {app}\Free Pascal.url
@@ -186,7 +186,7 @@ Type: files; Name: {localappdata}\FreePascal\fppkg\fppkg.cfg; Tasks: createfppkg
 [Components]
 Name: base; Description: Basic system for  win32; Flags: fixed; Types: Custom Minimum Full
 Name: binutils; Description: GNU linker and assembler; Flags: fixed; Types: Custom Minimum Full
-%DisableDocs%Name: docs; Description: Documentation in PDF; Types: Custom Full
+%DisableDocs%Name: docs; Description: Documentation/help (CHM); Types: Custom Full
 Name: ide; Description: Integrated Development Environment; Types: Custom Full
 Name: utils; Description: Free Pascal Utilities; Types: Custom Full
 Name: make; Description: GNU make; Types: Custom Full
@@ -266,7 +266,7 @@ Root: HKCU; Subkey: "Environment"; ValueType: String; ValueName: "PATH"; ValueDa
 [Run]
 FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default configuration file for Free Pascal compiler"; Parameters: "-d ""basepath={app}"" -d ""sharepath={app}"" -o ""{app}\bin\i386-Win32\fpc.cfg"""; Tasks: createcfg
 FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default configuration file for the Free Pascal IDE"; Parameters: "-1 -d ""basepath={app}"" -d ""sharepath={app}"" -o ""{app}\bin\i386-Win32\fp.cfg"""; Tasks: createidecfg
-FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default configuration file for the Free Pascal IDE"; Parameters: "-2 -d ""basepath={app}"" -d ""sharepath={app}"" -o ""{app}\bin\i386-Win32\fp.ini"""; Tasks: createidecfg
+FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default configuration file for the Free Pascal IDE"; Parameters: "-2 -d ""basepath={app}"" -d ""sharepath={app}"" -g  -o ""{app}\bin\i386-Win32\fp.ini"""; Tasks: createidecfg
 FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default configuration file the Free Pascal Packager (fppkg)"; Parameters: "-3 -p -d ""globalpath={app}"" -d ""globalprefix={app}"" -o ""{localappdata}\FreePascal\fppkg\fppkg.cfg"""; Tasks: createfppkgcfg
 FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default compiler configuration file for Free Pascal Packager (fppkg)"; Parameters: "-4 -p -d ""fpcbin={app}\bin\i386-Win32\fpc.exe"" -o ""{localappdata}\FreePascal\fppkg\config\default"""; Tasks: createfppkgcfg
 
diff --git a/install/fpcandroid.ist b/install/fpcandroid.ist
index 2dccc232..14f95b0f 100644
--- a/install/fpcandroid.ist
+++ b/install/fpcandroid.ist
@@ -12,6 +12,7 @@
 ;
 [Setup]
 AppName=Free Pascal Android
+OutputBaseFilename=fpc-setup
 ; this must match with the main installer
 AppID=FreePascal
 AppVerName=Free Pascal Android %FPCVERSION%
diff --git a/install/fpcce.ist b/install/fpcce.ist
index 4ce740b3..189bc7a4 100644
--- a/install/fpcce.ist
+++ b/install/fpcce.ist
@@ -12,6 +12,7 @@
 ;
 [Setup]
 AppName=Free Pascal CE
+OutputBaseFilename=fpc-setup
 ; this must match with the main installer
 AppID=FreePascal
 AppVerName=Free Pascal CE %FPCVERSION%
diff --git a/install/fpcjvm.ist b/install/fpcjvm.ist
index 828f870c..aa8dd0d5 100644
--- a/install/fpcjvm.ist
+++ b/install/fpcjvm.ist
@@ -12,6 +12,7 @@
 ;
 [Setup]
 AppName=Free Pascal JVM
+OutputBaseFilename=fpc-setup
 ; this must match with the main installer
 AppID=FreePascal
 AppVerName=Free Pascal JVM %FPCVERSION%
diff --git a/install/fpcmsdos.ist b/install/fpcmsdos.ist
index 4704ca1e..8e5f13d7 100644
--- a/install/fpcmsdos.ist
+++ b/install/fpcmsdos.ist
@@ -12,6 +12,7 @@
 ;
 [Setup]
 AppName=Free Pascal i8086
+OutputBaseFilename=fpc-setup
 ; this must match with the main installer
 AppID=FreePascal
 AppVerName=Free Pascal i8086 %FPCVERSION%
@@ -81,7 +82,7 @@ Source: fpmkinst\msdos\*.*; DestDir: {app}\fpmkinst\msdos; Flags: ignoreversion
 [Components]
 Name: base; Description: Basic system for win32 to i8086-msdos crosscompiler; Flags: fixed; Types: Custom Minimum Full
 Name: binutils; Description: NASM assembler; Flags: fixed; Types: Custom Minimum Full
-%DisableDocs%Name: docs; Description: Documentation in PDF; Types: Custom Full
+%DisableDocs%Name: docs; Description: Documentation/help (CHM); Types: Custom Full
 ; Name: ide; Description: Integrated Development Environment; Types: Custom Full
 ; Name: utils; Description: Free Pascal Utilities; Types: Custom Full
 ; Name: make; Description: GNU make; Types: Custom Full
diff --git a/install/fpcx64.ist b/install/fpcx64.ist
index 7bb208a8..35a77e1e 100644
--- a/install/fpcx64.ist
+++ b/install/fpcx64.ist
@@ -12,6 +12,7 @@
 ;
 [Setup]
 AppName=Free Pascal x64
+OutputBaseFilename=fpc-setup
 ; this must match with the main installer
 AppID=FreePascal
 AppVerName=Free Pascal x64 %FPCVERSION%
@@ -58,6 +59,7 @@ Source: bin\i386-win32\x86_64-win64-nm.exe; DestDir: {app}\bin\i386-win32; Flags
 Source: bin\i386-win32\x86_64-win64-objdump.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: binutils
 Source: bin\i386-win32\x86_64-win64-objcopy.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: binutils
 Source: bin\i386-win32\x86_64-win64-windres.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: binutils
+Source: bin\i386-win32\x86_64-win64-gcc.exe; DestDir: {app}\bin\i386-win32; DestName: "x86_64-win64-gcc.exe"; Flags: ignoreversion; Components: binutils
 Source: units\x86_64-win64\rtl\*.*; DestDir: {app}\units\x86_64-win64\rtl; Components: base
 ; Include license and readme files, so they are available even if somebody installs this package alone though
 ; it will not result in a working fpc installation
@@ -86,7 +88,7 @@ Source: fpmkinst\x86_64-win64\*.*; DestDir: {app}\fpmkinst\x86_64-win64; Flags:
 [Components]
 Name: base; Description: Basic system for win32 to x86_64-win64 crosscompiler; Flags: fixed; Types: Custom Minimum Full
 Name: binutils; Description: GNU linker and assembler; Flags: fixed; Types: Custom Minimum Full
-%DisableDocs%Name: docs; Description: Documentation in PDF; Types: Custom Full
+%DisableDocs%Name: docs; Description: Documentation/help (CHM); Types: Custom Full
 ; Name: ide; Description: Integrated Development Environment; Types: Custom Full
 ; Name: utils; Description: Free Pascal Utilities; Types: Custom Full
 ; Name: make; Description: GNU make; Types: Custom Full
diff --git a/install/fpcx86x64.ist b/install/fpcx86x64.ist
new file mode 100644
index 00000000..ffb17e19
--- /dev/null
+++ b/install/fpcx86x64.ist
@@ -0,0 +1,420 @@
+;**********************************************************************
+; We don't use the INNO Setup preprocessor. It is unfortunately quite buggy.
+; So, this script must be preprocessed by our own tools.
+; The preprocessor will replace anything enclosed in percent characters
+; by the value specified in it's config file. Standard there are only
+; the following things;
+; FPCVERSION   Version of FPC.
+; BUILDDIR     Build directory.
+;**********************************************************************
+;
+; ISS Build script generated on %BUILDDATE% - %BUILDTIME%
+;
+[Setup]
+AppName=Free Pascal (x86 & x64)
+OutputBaseFilename=fpc-setup
+AppID=FreePascal
+AppVerName=Free Pascal %FPCVERSION%
+AppPublisher=Free Pascal Team
+AppPublisherURL=http://www.freepascal.org/
+AppSupportURL=http://www.freepascal.org/
+AppUpdatesURL=http://www.freepascal.org/
+DefaultDirName={sd}\FPC\%FPCVERSION%
+DefaultGroupName=Free Pascal
+AllowNoIcons=yes
+InfoAfterFile=doc\fpc\whatsnew.txt
+Compression=lzma/max
+SolidCompression=true
+SourceDir=%BUILDDIR%
+InternalCompressLevel=max
+AppCopyright=GPL
+AppendDefaultDirName=false
+AlwaysShowComponentsList=false
+ShowLanguageDialog=yes
+; we put version numbers in the appdir, so never use old dirname
+UsePreviousAppDir=no
+; we update the PATH variable, so set ChangesEnvironment
+ChangesEnvironment=yes
+
+[Tasks]
+Name: associatepp; Description: "Associate .pp files with Free Pascal IDE"; GroupDescription: "File associations:"; Components: x86\ide
+Name: associateinc; Description: "Associate .inc files with Free Pascal IDE"; GroupDescription: "File associations:"; Components: x86\ide
+Name: associatepas; Description: "Associate .pas files with Free Pascal IDE"; GroupDescription: "File associations:"; Components: x86\ide; Flags: unchecked
+Name: associatedpr; Description: "Associate .dpr files with Free Pascal IDE"; GroupDescription: "File associations:"; Components: x86\ide; Flags: unchecked
+Name: createdesktopicon; Description: "Create a desktop icon for the Free Pascal IDE"; Components: x86\ide
+Name: createidecfg; Description: "Create a default configuration for the Free Pascal IDE"; Components: x86\ide
+Name: createcfg; Description: "Create a standard configuration file for the compiler"
+Name: createfppkgcfg; Description: "Create a standard configuration file for the package manager (fppkg)"
+
+[Files]
+; Base package
+Source: bin\i386-win32\ppc386.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\ppudump.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\ppufiles.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\ppumove.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\fp32.ico; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\fpc.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\instantfpc.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\fpcmkcfg.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\fppkg.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\rmcvsdir.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: bin\i386-win32\fpcsubst.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: base
+Source: doc\fpc\COPYING; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\copying.dj; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\copying.emx; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\copying.fpc; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\copying.rsx; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\COPYING.v2; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\COPYING.v3; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\faq.txt; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\faq.htm; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\licensez.ip; DestDir: {app}\doc\fpc; Components: base
+Source: doc\fpc\readme.txt; DestDir: {app}\doc\fpc; Components: base; Flags: isreadme
+Source: doc\fpc\whatsnew.txt; DestDir: {app}\doc\fpc; Components: base
+Source: msg\*.*; DestDir: {app}\msg; Components: base
+Source: units\i386-win32\rtl\*.*; DestDir: {app}\units\i386-win32\rtl; Components: x86\base
+Source: unicode\*.*; DestDir: {app}\unicode; Flags: recursesubdirs; Components: base
+; Binutils (asld)
+Source: bin\i386-win32\ar.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\as.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\cpp.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\dlltool.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\gcc.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\ld.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\nm.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\objdump.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\objcopy.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\windres.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\windres.h; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\strip.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\binutils
+Source: bin\i386-win32\gdb.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: gdb
+Source: bin\i386-win32\libexpat-1.dll; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: gdb
+; IDE files
+Source: bin\i386-win32\fp.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\fp32.ico; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\fp.ans; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\cvsco.tdf; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\cvsdiff.tdf; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\cvsup.tdf; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\gplprog.pt; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\gplunit.pt; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\unit.pt; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\program.pt; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\tpgrep.tdf; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: bin\i386-win32\grep.tdf; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x86\ide
+Source: doc\ide\readme.ide; DestDir: {app}\doc\ide; Flags: ignoreversion; Components: x86\ide
+; Make tools
+Source: bin\i386-win32\gdate.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\gecho.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\ginstall.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\ginstall.exe.manifest; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\gmkdir.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\grep.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\make.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\mv.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\patch.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\patch.exe.manifest; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\pwd.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\rm.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\unzip.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\zip.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\cmp.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\cp.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+Source: bin\i386-win32\diff.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: make
+; FPC Utilities
+Source: bin\i386-win32\bin2obj.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\data2inc.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\delp.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\fpcmake.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\fpdoc.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\fpmc.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+
+; makes no sense since we don't deliever the gtk dlls
+; Source: bin\i386-win32\fpmcgtk.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\fprcp.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\h2pas.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\h2paspp.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\makeskel.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\pas2jni.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\plex.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\postw32.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\ppdep.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\ptop.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\pyacc.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\rstconv.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\unitdiff.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\chmls.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\chmcmd.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\fpcres.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\yylex.cod; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+Source: bin\i386-win32\yyparse.cod; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: utils
+; Demos
+Source: demo\*.*; DestDir: {app}\demo; Flags: ignoreversion recursesubdirs ; Components: demo
+; Documentation
+%DisableDocs%Source: help\*.chm; DestDir: {app}\help; Flags: ignoreversion; Components: docs
+
+; Units
+Source: units\i386-win32\*.*; DestDir: {app}\units\i386-win32; Flags: ignoreversion recursesubdirs; Components: x86\units
+Source: fpmkinst\i386-win32\*.*; DestDir: {app}\fpmkinst\i386-win32; Flags: ignoreversion recursesubdirs; Components: x86\units
+; Examples
+Source: examples\*.*; DestDir: {app}\examples; Flags: ignoreversion recursesubdirs; Components: examples
+
+; x64
+; Base package
+Source: bin\i386-win32\ppcrossx64.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x64\base
+Source: bin\i386-win32\x86_64-win64-ar.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x64\binutils
+Source: bin\i386-win32\x86_64-win64-as.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x64\binutils
+Source: bin\i386-win32\x86_64-win64-ld.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x64\binutils
+Source: bin\i386-win32\x86_64-win64-strip.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x64\binutils
+Source: bin\i386-win32\x86_64-win64-nm.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x64\binutils
+Source: bin\i386-win32\x86_64-win64-objdump.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x64\binutils
+Source: bin\i386-win32\x86_64-win64-objcopy.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x64\binutils
+Source: bin\i386-win32\x86_64-win64-windres.exe; DestDir: {app}\bin\i386-win32; Flags: ignoreversion; Components: x64\binutils
+Source: bin\i386-win32\gcc.exe; DestDir: {app}\bin\i386-win32; DestName: "x86_64-win64-gcc.exe"; Flags: ignoreversion; Components: x64\binutils
+Source: units\x86_64-win64\rtl\*.*; DestDir: {app}\units\x86_64-win64\rtl; Components: x64\base
+; Include license and readme files, so they are available even if somebody installs this package alone though
+; it will not result in a working fpc installation
+Source: doc\fpc\libffi.txt; DestDir: {app}\doc\fpc; Flags: onlyifdoesntexist; Components: x64\base
+
+; Units
+Source: units\x86_64-win64\*.*; DestDir: {app}\units\x86_64-win64; Flags: ignoreversion recursesubdirs; Components: x64\units
+Source: fpmkinst\x86_64-win64\*.*; DestDir: {app}\fpmkinst\x86_64-win64; Flags: ignoreversion recursesubdirs; Components: x64\units
+
+
+[INI]
+Filename: {app}\Free Pascal.url; Section: InternetShortcut; Key: URL; String: http://www.freepascal.org/
+
+[Icons]
+Name: {userdesktop}\Free Pascal IDE; Filename: {app}\bin\i386-win32\fp.exe; components: x86\ide; IconFileName: {app}\bin\i386-win32\fp32.ico; WorkingDir: {app}\bin\i386-win32; Tasks: createdesktopicon
+Name: {group}\Free Pascal; Filename: {app}\bin\i386-win32\fp.exe; components: x86\ide; IconFileName: {app}\bin\i386-win32\fp32.ico; WorkingDir: {app}\bin\i386-win32
+Name: {group}\{cm:ProgramOnTheWeb,Free Pascal}; Filename: {app}\Free Pascal.url; IconFileName: {app}\bin\i386-win32\fp32.ico;
+Name: {group}\{cm:UninstallProgram,Free Pascal}; Filename: {uninstallexe}
+%DisableDocs%Name: {group}\Documentation\User's manual; Filename: {app}\help\user.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Programmer's manual; Filename: {app}\help\prog.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Reference manual; Filename: {app}\help\ref.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Run-Time Library Reference guide; Filename: {app}\help\rtl.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Free Component Library Reference guide; Filename: {app}\help\fcl.chm; Components: docs
+%DisableDocs%Name: {group}\Documentation\Free Pascal code documenter Reference manual; Filename: {app}\help\fpdoc.chm; Components: docs
+
+[UninstallDelete]
+Type: files; Name: {app}\Free Pascal.url
+Type: files; Name: {app}\bin\i386-win32\fpc.cfg; Tasks: createcfg;
+Type: files; Name: {app}\bin\i386-Win32\fp.cfg; Tasks: createidecfg;
+Type: files; Name: {app}\bin\i386-Win32\fp.ini; Tasks: createidecfg;
+Type: files; Name: {localappdata}\FreePascal\fppkg\config\default; Tasks: createfppkgcfg;
+Type: files; Name: {localappdata}\FreePascal\fppkg\fppkg.cfg; Tasks: createfppkgcfg;
+
+[Components]
+Name: base; Description: Basic system for Windows (x86/x64); Flags: fixed; Types: Custom Minimum Full
+Name: x86; Description: Free Pascal for Win32 (x86); Types: Custom Minimum Full
+Name: x86\base; Description: Basic system for Win32 (x86); Types: Custom Minimum Full
+Name: x86\binutils; Description: GNU linker and assembler (x86); Types: Custom Minimum Full
+Name: x86\ide; Description: Integrated Development Environment (x86); Types: Custom Full
+Name: x86\units; Description: Units (x86); Types: Full Minimum Custom
+Name: x64; Description: Free Pascal for Win64 (x64);Types: Custom Minimum Full
+Name: x64\base; Description: Basic system for Win64 (x64); Types: Custom Minimum Full
+Name: x64\binutils; Description: GNU linker and assembler (x64); Types: Custom Minimum Full
+Name: x64\units; Description: Units (x64); Types: Full Minimum Custom
+%DisableDocs%Name: docs; Description: Documentation/help (CHM); Types: Custom Full
+Name: utils; Description: Free Pascal Utilities; Types: Custom Full
+Name: make; Description: GNU make; Types: Custom Full
+Name: demo; Description: Demos; Types: Custom Full
+Name: gdb; Description: GNU debugger; Types: Full Custom
+Name: examples; Description: Examples; Types: Full Custom
+
+
+[Types]
+Name: Full; Description: Full installation
+Name: Minimum; Description: Minimum installation
+Name: Custom; Description: Custom installation; Flags: iscustom
+
+[Code]
+function IsHKLMWriteable(): boolean;
+begin
+  Result := IsAdminLoggedOn or IsPowerUserLoggedOn;
+end;
+
+function IsHKLMNotWriteable: boolean;
+begin
+  Result := not IsHKLMWriteable();
+end;
+
+[Registry]
+; Associate .pp with FP IDE (admin mode)
+Root: HKLM; Subkey: "SOFTWARE\Classes\.pp"; ValueType: string; ValueName: ""; ValueData: "FPCPPFile"; Flags: uninsdeletevalue; Tasks: associatepp; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\Classes\FPCPPFile"; ValueType: string; ValueName: ""; ValueData: "Free Pascal File"; Flags: uninsdeletekey; Tasks: associatepp; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\Classes\FPCPPFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\i386-Win32\fpc32.ico"; Tasks: associatepp;Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\Classes\FPCPPFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\i386-win32\fp.exe"" ""%1""";Tasks: associatepp; Check: IsHKLMWriteable
+; Associate .pp with FP IDE (restricted user)
+Root: HKCU; Subkey: "SOFTWARE\Classes\.pp"; ValueType: string; ValueName: ""; ValueData: "FPCPPFile"; Flags: uninsdeletevalue; Tasks: associatepp; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\Classes\FPCPPFile"; ValueType: string; ValueName: ""; ValueData: "Free Pascal File"; Flags: uninsdeletekey; Tasks: associatepp; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\Classes\FPCPPFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\i386-Win32\fpc32.ico"; Tasks: associatepp; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\Classes\FPCPPFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\i386-win32\fp.exe"" ""%1""";Tasks: associatepp; Check: IsHKLMNotWriteable
+
+; Associate .inc with FP IDE (admin mode)
+Root: HKLM; Subkey: "SOFTWARE\Classes\.inc"; ValueType: string; ValueName: ""; ValueData: "FPCINCFile"; Flags: uninsdeletevalue; Tasks: associateinc; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\Classes\FPCINCFile"; ValueType: string; ValueName: ""; ValueData: "Free Pascal include File"; Flags: uninsdeletekey; Tasks: associateinc; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\Classes\FPCINCFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\i386-Win32\fpc32.ico"; Tasks: associateinc; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\Classes\FPCINCFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\i386-win32\fp.exe"" ""%1""";Tasks: associateinc; Check: IsHKLMWriteable
+; Associate .inc with FP IDE (restricted user)
+Root: HKCU; Subkey: "SOFTWARE\Classes\.inc"; ValueType: string; ValueName: ""; ValueData: "FPCINCFile"; Flags: uninsdeletevalue; Tasks: associateinc;  Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\Classes\FPCINCFile"; ValueType: string; ValueName: ""; ValueData: "Free Pascal include File"; Flags: uninsdeletekey; Tasks: associateinc; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\Classes\FPCINCFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\i386-Win32\fpc32.ico"; Tasks: associateinc; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\Classes\FPCINCFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\i386-win32\fp.exe"" ""%1""";Tasks: associateinc; Check: IsHKLMNotWriteable
+
+; Associate .pas with FP IDE (admin mode)
+Root: HKLM; Subkey: "SOFTWARE\Classes\.pas"; ValueType: string; ValueName: ""; ValueData: "FPCPASFile"; Flags: uninsdeletevalue; Tasks: associatepas; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\Classes\FPPASFile"; ValueType: string; ValueName: ""; ValueData: "Free Pascal File"; Flags: uninsdeletekey; Tasks: associatepas; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\Classes\FPPASFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\i386-Win32\fpc32.ico"; Tasks: associatepas; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\Classes\FPPASFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\i386-win32\fp.exe"" ""%1""";Tasks: associatepas; Check: IsHKLMWriteable
+; Associate .pas with FP IDE (restricted user)
+Root: HKCU; Subkey: "SOFTWARE\Classes\.pas"; ValueType: string; ValueName: ""; ValueData: "FPCPASFile"; Flags: uninsdeletevalue; Tasks: associatepas; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\Classes\FPPASFile"; ValueType: string; ValueName: ""; ValueData: "Free Pascal File"; Flags: uninsdeletekey; Tasks: associatepas; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\Classes\FPPASFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\i386-Win32\fpc32.ico"; Tasks: associatepas; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\Classes\FPPASFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\i386-win32\fp.exe"" ""%1""";Tasks: associatepas; Check: IsHKLMNotWriteable
+
+; Associate .dpr with FP IDE (admin mode)
+Root: HKLM; Subkey: "SOFTWARE\.dpr"; ValueType: string; ValueName: ""; ValueData: "FPCDPRFile"; Flags: uninsdeletevalue; Tasks: associatedpr; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\FPDPRFile"; ValueType: string; ValueName: ""; ValueData: "Free Pascal Project File"; Flags: uninsdeletekey; Tasks: associatedpr; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\FPDPRFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\i386-Win32\fpc32.ico"; Tasks: associatedpr; Check: IsHKLMWriteable
+Root: HKLM; Subkey: "SOFTWARE\FPDPRFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\i386-win32\fp.exe"" ""%1""";Tasks: associatedpr; Check: IsHKLMWriteable
+; Associate .dpr with FP IDE (restricted user)
+Root: HKCU; Subkey: "SOFTWARE\.dpr"; ValueType: string; ValueName: ""; ValueData: "FPCDPRFile"; Flags: uninsdeletevalue; Tasks: associatedpr; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\FPDPRFile"; ValueType: string; ValueName: ""; ValueData: "Free Pascal Project File"; Flags: uninsdeletekey; Tasks: associatedpr; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\FPDPRFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\bin\i386-Win32\fpc32.ico"; Tasks: associatedpr; Check: IsHKLMNotWriteable
+Root: HKCU; Subkey: "SOFTWARE\FPDPRFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\i386-win32\fp.exe"" ""%1""";Tasks: associatedpr; Check: IsHKLMNotWriteable
+
+; Extend path in NT,2000 or XP. Does not work in 95/98/Me
+; System-wide
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "PATH"; ValueData: "{reg:HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Environment,PATH|};{app}\bin\i386-Win32";MinVersion: 5.0,4.0; Check: IsHKLMWriteable
+; Current user only
+Root: HKCU; Subkey: "Environment"; ValueType: String; ValueName: "PATH"; ValueData: "{reg:HKCU\environment,PATH|};{app}\bin\i386-Win32";MinVersion: 5.0,4.0; Check: IsHKLMNotWriteable
+
+
+[Run]
+FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default configuration file for Free Pascal compiler"; Parameters: "-d ""basepath={app}"" -d ""sharepath={app}"" -o ""{app}\bin\i386-Win32\fpc.cfg"""; Tasks: createcfg
+FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default configuration file for the Free Pascal IDE"; Parameters: "-1 -d ""basepath={app}"" -d ""sharepath={app}"" -o ""{app}\bin\i386-Win32\fp.cfg"""; Tasks: createidecfg
+FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default configuration file for the Free Pascal IDE"; Parameters: "-2 -d ""basepath={app}"" -d ""sharepath={app}"" -g -o ""{app}\bin\i386-Win32\fp.ini"""; Tasks: createidecfg
+FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default configuration file the Free Pascal Packager (fppkg)"; Parameters: "-3 -p -d ""globalpath={app}"" -d ""globalprefix={app}"" -o ""{localappdata}\FreePascal\fppkg\fppkg.cfg"""; Tasks: createfppkgcfg
+FileName: {app}\bin\i386-win32\fpcmkcfg.exe; Description: "Creating default compiler configuration file for Free Pascal Packager (fppkg)"; Parameters: "-4 -p -d ""fpcbin={app}\bin\i386-Win32\fpc.exe"" -o ""{localappdata}\FreePascal\fppkg\config\default"""; Tasks: createfppkgcfg
+
+[Code]
+
+const
+  regUninstall = 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FreePascal_is1';
+
+var
+  OldInstDir: string;
+
+function RegReadString(RootKey: Integer; const SubKeyName, ValueName, DefValue: String): String;
+begin
+  if not RegQueryStringValue(RootKey, SubKeyName, ValueName, Result) then
+    Result:=DefValue;
+end;
+
+procedure CleanupPath(const Dir: string);
+var
+  p, s, path, newpath, oldpath, regpath: string;
+  i, regroot: integer;
+begin
+  if Dir = '' then
+    exit;
+  if IsHKLMWriteable then begin
+    regroot:=HKEY_LOCAL_MACHINE;
+    regpath:='SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
+  end
+  else begin
+    regroot:=HKEY_CURRENT_USER;
+    regpath:='Environment';
+  end;
+
+  path:=RegReadString(regroot, regpath, 'PATH', '')
+  if path = '' then
+    exit;
+
+  newpath:='';
+  oldpath:=path;
+  p:=AddBackslash(Dir) + 'bin\i386-win32';
+  while path <> '' do begin
+    i:=Pos(';', path);
+    if i = 0 then
+      i:=Length(path) + 1;
+    s:=Copy(path, 1, i - 1);
+    Delete(path, 1, i);
+    if CompareText(RemoveBackslash(s), p) <> 0 then begin
+      if newpath <> '' then
+        newpath:=newpath + ';';
+      newpath:=newpath + s;
+    end;
+  end;
+
+  if newpath <> oldpath then
+    RegWriteStringValue(regroot, regpath, 'PATH', newpath);
+end;
+
+function InitializeSetup(): Boolean;
+var
+  UninstallApp, OldName, CurName, CurVer, s: string;
+  i: integer;
+begin
+  Result:=False;
+  CurVer:='%FPCVERSION%';
+  CurName:='Free Pascal ' + CurVer;
+  OldName:=RegReadString(HKEY_LOCAL_MACHINE, regUninstall, 'DisplayName', '');
+  OldInstDir:=RegReadString(HKEY_LOCAL_MACHINE, regUninstall, 'InstallLocation', '');
+  UninstallApp:=RemoveQuotes(RegReadString(HKEY_LOCAL_MACHINE, regUninstall, 'UninstallString', ''));
+  if (OldInstDir <> '') and (OldName <> CurName) and FileExists(UninstallApp) then begin
+    i:=MsgBox('Other version of Free Pascal is already installed on this computer:'#13#10#13#10+
+              OldName + ' (' + RemoveBackslash(OldInstDir) + ')'#13#10#13#10+
+              'Uninstall the existing version of Free Pascal?',
+              mbConfirmation, MB_YESNOCANCEL or MB_DEFBUTTON2);
+
+    case i of
+      IDCANCEL:
+        // Cancel installation
+        exit;
+
+      IDYES:
+        begin
+          // Uninstall existing version
+          i:=0;
+          s:='';
+          if not Exec(UninstallApp, '/SILENT', OldInstDir, SW_SHOW, ewWaitUntilTerminated, i) then
+            s:='Unable to execute the uninstaller.'#13#10 + SysErrorMessage(i)
+          else
+            if i <> 0 then
+              s:=Format('The uninstaller returned an error code: %d', [i]);
+
+          if s <> '' then begin
+            i:=MsgBox(s + #13#10#13#10'Continue installation?', mbError, MB_YESNO);
+            if i <> IDYES then
+              exit;
+          end;
+
+          // Remove path of the uninstalled FPC from the PATH environment variable
+          CleanupPath(OldInstDir);
+          OldInstDir:='';
+        end;
+    end;
+  end;
+
+  Result:=True;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssInstall then begin
+    // Remove existing FPC path from the PATH environment variable
+    CleanupPath(OldInstDir);
+    CleanupPath(ExpandConstant('{app}'));
+  end;
+end;
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+begin
+  if CurUninstallStep = usUninstall then begin
+    // Remove FPC path from the PATH environment variable
+    OldInstDir:=RegReadString(HKEY_LOCAL_MACHINE, regUninstall, 'InstallLocation', '');
+    CleanupPath(OldInstDir);
+  end;
+end;
diff --git a/install/install.sh b/install/install.sh
index 6d29adb4..7689bf7e 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -38,12 +38,39 @@ yesno ()
 #
 #
 #
+CMDGREP="grep"
+CMDGGREP="`which ggrep 2> /dev/null`"
+if [ -f "$CMDGGREP" ] ; then
+  CMDGREP="$CMDGGREP"
+  echo "Using GREP binary=$CMDGREP"
+fi
+grep_version=`$CMDGREP --version 2> /dev/null `
+grep_version_res=$?
+if [ $grep_version_res -ne 0 ] ; then
+  echo "Installed grep command $CMDGREP does not support --version"
+  grep_version=""
+fi
+
+if [ "${grep_version//GNU/}" != "${grep_version}" ] ; then
+  is_gnu_grep=1
+  grep_silent_opt="-q"
+else
+  is_gnu_grep=0
+  grep_silent_opt=""
+fi
+
 CMDTAR="tar"
+# Use GNU tar if present
+CMDGTAR="`which gtar 2> /dev/null`"
+if [ -f "$CMDGTAR" ]; then
+  CMDTAR="$CMDGTAR"
+  echo "Using TAR binary=$CMDTAR"
+fi
 
 tar_version=`$CMDTAR --version 2> /dev/null `
 tar_version_res=$?
 if [ $tar_version_res -ne 0 ] ; then
-  echo "Installed tar command does not support --version"
+  echo "Installed tar command $CMDTAR does not support --version"
   tar_version=""
 fi
 
@@ -51,23 +78,54 @@ if [ "${tar_version//GNU/}" != "${tar_version}" ] ; then
   is_gnu_tar=1
   no_same_owner_tar_opt=--no-same-owner
   strip_tar_opt="--strip 1"
+  use_gunzip=0
 else
   is_gnu_tar=0
   no_same_owner_tar_opt=
   strip_tar_opt=
+  use_gunzip=1
 fi
 
 TAR="$CMDTAR $no_same_owner_tar_opt"
 # Untar files ($3,optional) from  file ($1) to the given directory ($2)
 unztar ()
 {
- $TAR -xzf "$HERE/$1" -C "$2" $3
+ if [ $use_gunzip -eq 0 ] ; then
+   $TAR -xzf "$HERE/$1" -C "$2" $3
+ else
+   startdir="`pwd`" 
+   targzfile="$HERE/$1"
+   tarfile="${targzfile/tar.gz/tar}"
+   if [ ! -f "$tarfile" ] ; then
+     gunzip "$targzfile"
+   fi
+   cd "$2"
+   $TAR -xf "$tarfile" $3
+   cd "$startdir"
+ fi
 }
 
 # Untar tar.gz file ($2) from file ($1) and untar result to the given directory ($3)
 unztarfromtar ()
 {
- $CMDTAR -xOf "$HERE/$1" "$2" | $TAR -C "$3" -xzf -
+ if [ $use_gunzip -eq 0 ] ; then
+   $CMDTAR -xOf "$HERE/$1" "$2" | $TAR -C "$3" -xzf -
+ else
+   startdir="`pwd`"
+   $CMDTAR -xf "$HERE/$1" "$2"
+   targzfile="$startdir/$2"
+   tarfile="${targzfile/tar.gz/tar}"
+   if [ ! -f "$tarfile" ] ; then
+     gunzip "$targzfile"
+   fi
+   cd "$3"
+   $TAR -xf "$tarfile"
+   res=$?
+   if [ $res -eq 0 ] ; then
+     rm -f "$2"
+   fi
+   cd "$startdir"
+ fi
 }
 
 # Get file list from tar archive ($1) in variable ($2)
@@ -111,44 +169,50 @@ installbinary ()
   if [ "$2" = "" ]; then
     FPCTARGET="$1"
     CROSSPREFIX=
+    PPCPREFIX=ppc
   else
     FPCTARGET=`echo $2 | sed 's/-$//'`
     CROSSPREFIX="$2"
+    PPCPREFIX=ppcross
   fi
 
   BINARYTAR="${CROSSPREFIX}binary.$1.tar"
 
+  # Select CPU part of FPCTARGET
+  PPCSUFFIX=${FPCTARGET/-*/}
   # conversion from long to short archname for ppc<x>
-  case $FPCTARGET in
-    m68k*)
+  case $PPCSUFFIX in
+    aarch64)
+      PPCSUFFIX=a64;;
+    alpha)
+      PPCSUFFIX=axp;;
+    m68k)
       PPCSUFFIX=68k;;
-    sparc*)
-      PPCSUFFIX=sparc;;
-    i386*)
+    i386)
       PPCSUFFIX=386;;
-    powerpc64*)
-      PPCSUFFIX=ppc64;;
-    powerpc*)
+    i8086)
+      PPCSUFFIX=8086;;
+    powerpc)
       PPCSUFFIX=ppc;;
-    arm*)
-      PPCSUFFIX=arm;;
-    x86_64*)
+    powerpc64)
+      PPCSUFFIX=ppc64;;
+    riscv32)
+      PPCSUFFIX=rv32;;
+    riscv64)
+      PPCSUFFIX=rv64;;
+    x86_64)
       PPCSUFFIX=x64;;
-    mips*)
-      PPCSUFFIX=mips;;
-    ia64*)
-      PPCSUFFIX=ia64;;
-    alpha*)
-      PPCSUFFIX=axp;;
-    aarch64*)
-      PPCSUFFIX=a64;;
-    i8086*)
-      PPCSUFFIX=8086;;
   esac
 
   # Install compiler/RTL. Mandatory.
   echo "Installing compiler and RTL for $FPCTARGET..."
-  unztarfromtar "$BINARYTAR" "${CROSSPREFIX}base.$1.tar.gz" "$PREFIX"
+  # Full install builds cross generated on x86_64-linux have a different name for base tar.gz file
+  basetargz=`$CMDTAR -tf "$BINARYTAR" | sed -n -e "/^base.*tar\.gz/p" -e "/^$FPCTARGET-base.*tar\.gz/p" | head -1 `
+  if [ -n "$basetargz" ] ; then
+    unztarfromtar "$BINARYTAR" "$basetargz" "$PREFIX"
+  else
+    unztarfromtar "$BINARYTAR" "${CROSSPREFIX}base.$1.tar.gz" "$PREFIX"
+  fi
 
   if [ -f "binutils-${CROSSPREFIX}$1.tar.gz" ]; then
     if yesno "Install Cross binutils"; then
@@ -157,8 +221,15 @@ installbinary ()
   fi
 
   # Install symlink
-  rm -f "$EXECDIR/ppc${PPCSUFFIX}"
-  ln -sf "$LIBDIR/ppc${PPCSUFFIX}" "$EXECDIR/ppc${PPCSUFFIX}"
+  if [ -f "$LIBDIR/${PPCPREFIX}${PPCSUFFIX}" ] ; then
+    rm -f "$EXECDIR/${PPCPREFIX}${PPCSUFFIX}"
+    ln -sf "$LIBDIR/${PPCPREFIX}${PPCSUFFIX}" "$EXECDIR/${PPCPREFIX}${PPCSUFFIX}"
+  elif [ -f "$LIBDIR/ppc${PPCSUFFIX}" ] ; then
+    rm -f "$EXECDIR/ppc${PPCSUFFIX}"
+    ln -sf "$LIBDIR/ppc${PPCSUFFIX}" "$EXECDIR/ppc${PPCSUFFIX}"
+  else
+    echo "Warning: Compiler for $FPCTARGET not found"
+  fi
 
   echo "Installing rtl packages..."
   listtarfiles "$BINARYTAR" packages units-rtl
@@ -182,8 +253,8 @@ installbinary ()
   listtarfiles "$BINARYTAR" packages units
   for f in $packages
   do
-    if ! echo "$f" | grep -q fcl > /dev/null ; then
-      if ! echo "$f" | grep -q rtl > /dev/null ; then
+    if ! echo "$f" | $CMDGREP $grep_silent_opt fcl > /dev/null ; then
+      if ! echo "$f" | $CMDGREP $grep_silent_opt rtl > /dev/null ; then
         p=`echo "$f" | sed -e 's+^.*units-\([^\.]*\)\..*+\1+'`
 	echo "Installing $p"
         unztarfromtar "$BINARYTAR" "$f" "$PREFIX"
@@ -261,20 +332,8 @@ case "$OSNAME" in
        echo "upgrading binutils package to at least version 2.21"
      fi
      PREFIX=/usr/local
-     # Use GNU tar if present
-     if [ "`which gtar`" != "" ]; then
-       CMDTAR=`which gtar`
-       TAR="$CMDTAR --no-same-owner"
-     fi
-     echo "Using TAR binary=$CMDTAR"
   ;;
   aix)
-     # Use GNU tar if present
-     if [ "`which gtar`" != "" ]; then
-       CMDTAR=`which gtar`
-       TAR="$CMDTAR --no-same-owner"
-     fi
-     echo "Using TAR binary=$CMDTAR"
      # Install in /usr/local or /usr ?
      if checkpath /usr/local/bin; then
          PREFIX=/usr/local
diff --git a/install/macosx/scripts/buildinstalliosrelease.sh b/install/macosx/scripts/buildinstalliosrelease.sh
index 30438e3c..cee5ab55 100755
--- a/install/macosx/scripts/buildinstalliosrelease.sh
+++ b/install/macosx/scripts/buildinstalliosrelease.sh
@@ -14,7 +14,7 @@
 # Configuration
 ###################################
 
-SDKx64=${SDKx64-/Volumes/Data/dev/osxsdk/MacOSX10.5.sdk}
+SDKx64=${SDKx64-/Volumes/Data/dev/osxsdk/MacOSX10.6.sdk}
 # separate for 32 and 64 bit since latest SDKs no longer include 32 bit support
 SDKARM=${SDKARM-/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk}
 SDKAARCH64=${SDKAARCH64-/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk}
@@ -57,9 +57,9 @@ BASEOPT="-ap"
 # Build ARM cross-compiler and units
 cd "$FPCBUILD"/fpcsrc
 make FPC="$1/ppcx64" OPT="$BASEOPT" distclean -j $NCPU
-make FPC="$1/ppcx64" OPT="$BASEOPT" CROSSOPT="-WP6.0 -CpARMv7 -Cfvfpv3 -XR${SDKARM}" CPU_TARGET=arm all -j $NCPU CPU_SOURCE=x86_64 FPMAKEOPT="-T $NCPU --target=arm-darwin"
+make FPC="$1/ppcx64" OPT="$BASEOPT" CROSSOPT="-WP6.0 -CpARMv7 -Cfvfpv3 -XR${SDKARM}" CPU_TARGET=arm OS_TARGET=ios all -j $NCPU CPU_SOURCE=x86_64 FPMAKEOPT="-T $NCPU --target=arm-darwin"
 VERSION=`./compiler/ppcrossarm -iV`
-make FPC="$1/ppcx64" OPT="$BASEOPT" CROSSOPT="-WP6.0 -CpARMv7 -Cfvfpv3 -XR${SDKARM}" INSTALL_PREFIX="$InstallDirIOS" CPU_TARGET=arm CROSSINSTALL=1 install
+make FPC="$1/ppcx64" OPT="$BASEOPT" CROSSOPT="-WP6.0 -CpARMv7 -Cfvfpv3 -XR${SDKARM}" INSTALL_PREFIX="$InstallDirIOS" CPU_TARGET=arm OS_TARGET=ios CROSSINSTALL=1 install
 cd "$InstallDirIOS"/bin
 mv ../lib/fpc/$VERSION/ppcrossarm ../lib/fpc/$VERSION/ppcarm
 ln -sf ../lib/fpc/$VERSION/ppcarm
@@ -67,12 +67,13 @@ ln -sf ../lib/fpc/$VERSION/ppcarm
 # Build AARCH64 cross-compiler and units
 cd "$FPCBUILD"/fpcsrc
 make FPC="$1/ppcx64" OPT="$BASEOPT" distclean -j $NCPU
-make FPC="$1/ppcx64" OPT="$BASEOPT" CROSSOPT="-WP7.0 -XR${SDKAARCH64}" CPU_TARGET=aarch64 all -j $NCPU CPU_SOURCE=x86_64 FPMAKEOPT="-T $NCPU --target=aarch64-darwin"
+make FPC="$1/ppcx64" OPT="$BASEOPT" CROSSOPT="-WP7.0 -XR${SDKAARCH64}" CPU_TARGET=aarch64 OS_TARGET=ios all -j $NCPU CPU_SOURCE=x86_64 FPMAKEOPT="-T $NCPU --target=aarch64-darwin"
 VERSION=`./compiler/ppcrossa64 -iV`
-make FPC="$1/ppcx64" OPT="$BASEOPT" CROSSOPT="-WP7.0 -XR${SDKAARCH64}" INSTALL_PREFIX="$InstallDirIOS" CPU_TARGET=aarch64 CROSSINSTALL=1 install
+make FPC="$1/ppcx64" OPT="$BASEOPT" CROSSOPT="-WP7.0 -XR${SDKAARCH64}" INSTALL_PREFIX="$InstallDirIOS" CPU_TARGET=aarch64 OS_TARGET=ios CROSSINSTALL=1 install
 cd "$InstallDirIOS"/bin
-mv ../lib/fpc/$VERSION/ppcrossa64 ../lib/fpc/$VERSION/ppca64
-ln -sf ../lib/fpc/$VERSION/ppca64
+# mv ../lib/fpc/$VERSION/ppcrossa64 ../lib/fpc/$VERSION/ppca64
+# ln -sf ../lib/fpc/$VERSION/ppca64
+rm ../lib/fpc/$VERSION/ppcrossa64
 
 # Build iphonsim 32 bit cross-compiler
 cd "$FPCBUILD"/fpcsrc
@@ -102,16 +103,18 @@ fi
 cd "$FPCBUILD"/fpcsrc
 make FPC="$1"/ppcx64 OPT="$BASEOPT" distclean -j $NCPU
 cd compiler
-make FPC="$1/ppcx64" CPU_SOURCE=x86_64 OPT="$BASEOPT -WM10.5 -FD${BINUTILSDIR} -XR${SDKx64}" -j $NCPU FPMAKEOPT="-T $CNPU" cycle ppuclean i386 arm aarch64
+make FPC="$1/ppcx64" CPU_SOURCE=x86_64 OPT="$BASEOPT -WM10.6 -FD${BINUTILSDIR} -XR${SDKx64}" -j $NCPU FPMAKEOPT="-T $CNPU" cycle ppuclean i386 arm
+# aarch64
 if [ $CREATECUSTOMX86COMPILERBINARIES -eq 1 ]; then
   mv ppcx64 ppc386 "$InstallDirIOS"/lib/fpc/$VERSION
 fi
-mv ppcarm ppca64 "$InstallDirIOS"/lib/fpc/$VERSION
+mv ppcarm "$InstallDirIOS"/lib/fpc/$VERSION
+# mv ppca64 "$InstallDirIOS"/lib/fpc/$VERSION
 
 if [ $CREATECUSTOMX86COMPILERBINARIES -eq 1 ]; then
   # build complete native version to get the fpc, fpcres and fpcmake binaries with AArch64 support
   cd "$FPCBUILD"/fpcsrc
-  make FPC="$1/ppcx64" CPU_SOURCE=x86_64 OPT="$BASEOPT -FD${BINUTILSDIR} -WM10.5 -XR${SDKx64}" all -j $NCPU FPMAKEOPT="-T $NCPU --target=x86_64-darwin" OVERRIDEVERSIONCHECK=1
+  make FPC="$1/ppcx64" CPU_SOURCE=x86_64 OPT="$BASEOPT -FD${BINUTILSDIR} -WM10.6 -XR${SDKx64}" all -j $NCPU FPMAKEOPT="-T $NCPU --target=x86_64-darwin" OVERRIDEVERSIONCHECK=1
   mv compiler/utils/fpc "$InstallDirIOS"/bin
   mv utils/fpcres/bin/x86_64-darwin/fpcres "$InstallDirIOS"/bin
   mv utils/fpcm/bin/x86_64-darwin/fpcmake "$InstallDirIOS"/bin
diff --git a/install/macosx/scripts/buildinstallx86release.sh b/install/macosx/scripts/buildinstallx86release.sh
index 7e5bc169..e9bafe3a 100755
--- a/install/macosx/scripts/buildinstallx86release.sh
+++ b/install/macosx/scripts/buildinstallx86release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # enable to debug when things go wrong, run script as $0 para1 para2 >tt.log 2>tt2.log
-set -vx
+#set -vx
 
 # This scripts builds i386/x86-64 "fat" binaries of i386/x86-64 compilers, and also of ppc/ppc64 and
 # jvm cross-compilers
@@ -15,11 +15,15 @@ set -vx
 
 # defaults for (old) SDK locations
 SDKi386=${SDKi386-/Volumes/Data/dev/osxsdk/MacOSX10.4u.sdk}
-SDKx64=${SDKx64-/Volumes/Data/dev/osxsdk/MacOSX10.5.sdk}
+SDKx64=${SDKx64-/Volumes/Data/dev/osxsdk/MacOSX10.6.sdk}
 SDKppc=${SDKppc-$SDKi386}
 SDKppc64=${SDKppc64-$SDKppc}
-BINUTILSDIR=${BINUTILSIDR-/Volumes/Data/dev/osxsdk/Xcode502toolchain/usr/bin}
+SDKaarch64=${SDKaarch64-$HOME/bigsursdk}
+# BINUTILSDIR=${BINUTILSDIR-/Volumes/Data/dev/osxsdk/Xcode502toolchain/usr/bin}
+BINUTILSDIR=${BINUTILSDIR-/usr/bin}
+BINUTILSDIRi386=${BINUTILSDIRi386-/Volumes/Data/dev/osxsdk/Xcode502toolchain/usr/bin}
 BINUTILSDIRppc=${BINUTILSDIRppc-/Volumes/Data/dev/osxsdk/oldcctools/usr/bin}
+BINUTILSDIRaarch64=${BINUTILSDIRaarch64-$HOME/bigsurbin}
 if [ x${NCPU} = x ]; then
   NCPU=`sysctl -n machdep.cpu.core_count`
 fi
@@ -45,10 +49,13 @@ BASEDIR=`dir_resolve "$BASEDIR"`
 source "$BASEDIR"/helpers.sh
 
 InstallDirX86="${InstallBaseDir}/x86/usr/local"
+rm -rf "$InstallDirX86"
 mkdir -p "$InstallDirX86"
 InstallDirPPC="${InstallBaseDir}/ppc/usr/local"
+rm -rf "$InstallDirPPC"
 mkdir -p "$InstallDirPPC"
 InstallDirJVM="${InstallBaseDir}/jvm/usr/local"
+rm -rf "$InstallDirJVM"
 mkdir -p "$InstallDirJVM"
 
 ######################################################
@@ -63,15 +70,15 @@ BASEOPT="-ap -FD${BINUTILSDIR}"
 # build the native x86-64 binaries and units
 cd "$FPCBUILD"/fpcsrc
 make FPC="$1/ppcx64" OPT="$BASEOPT" distclean -j $NCPU
-make FPC="$1/ppcx64" OPT="$BASEOPT -WM10.5 -XR${SDKx64}" CPU_SOURCE=x86_64 all -j $NCPU FPMAKEOPT="-T $NCPU --target=x86_64-darwin"
-make FPC=`pwd`/compiler/ppcx64 OPT="$BASEOPT -WM10.5 -XR${SDKx64}" INSTALL_PREFIX="$InstallDirX86" install
+make FPC="$1/ppcx64" OPT="$BASEOPT -WM10.6 -XR${SDKx64}" CPU_SOURCE=x86_64 all -j $NCPU FPMAKEOPT="-T $NCPU --target=x86_64-darwin"
+make FPC=`pwd`/compiler/ppcx64 OPT="$BASEOPT -WM10.6 -XR${SDKx64}" INSTALL_PREFIX="$InstallDirX86" install
 VERSION=`./compiler/ppcx64 -iV`
 InstalledCompilerDir="$InstallDirX86"/lib/fpc/$VERSION
 
 # Build x86-64 -> i386 cross-compiler
 cd "$FPCBUILD"/fpcsrc
-make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.5 -XR${SDKx64}" CROSSOPT="-WM10.4 -XR${SDKi386}" CPU_TARGET=i386 -j $NCPU FPMAKEOPT="-T $NCPU" all
-make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.5 -XR${SDKx64}" CROSSOPT="-WM10.4 -XR${SDKi386}" CPU_TARGET=i386 INSTALL_PREFIX="$InstallDirX86" CROSSINSTALL=1 install
+make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.6 -XR${SDKx64}" CROSSOPT="-WM10.4 -XR${SDKi386}" CPU_TARGET=i386 -j $NCPU FPMAKEOPT="-T $NCPU" all
+make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.6 -XR${SDKx64}" CROSSOPT="-WM10.4 -XR${SDKi386}" CPU_TARGET=i386 INSTALL_PREFIX="$InstallDirX86" CROSSINSTALL=1 install
 cd "$InstallDirX86"/bin
 mv ../lib/fpc/$VERSION/ppcross386 ../lib/fpc/$VERSION/ppc386
 
@@ -79,13 +86,13 @@ mv ../lib/fpc/$VERSION/ppcross386 ../lib/fpc/$VERSION/ppc386
 TMPINSTALLDIR=`mktemp -d -t fpcinst.XXXXXXX`
 cd "$FPCBUILD"/fpcsrc
 make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT" distclean -j $NCPU OVERRIDEVERSIONCHECK=1
-make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4 -XR${SDKi386}" CPU_SOURCE=i386 -j $NCPU FPMAKEOPT="-T $NCPU --target=i386-darwin" OVERRIDEVERSIONCHECK=1 all
-make FPC=`pwd`/compiler/ppc386 OPT="$BASEOPT -WM10.4 -XR${SDKi386}" CPU_SOURCE=i386 INSTALL_PREFIX="$TMPINSTALLDIR" install
+make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4 -FD${BINUTILSDIRi386} -XR${SDKi386}" CPU_SOURCE=i386 -j $NCPU FPMAKEOPT="-T $NCPU --target=i386-darwin" OVERRIDEVERSIONCHECK=1 all
+make FPC=`pwd`/compiler/ppc386 OPT="$BASEOPT -WM10.4 -FD${BINUTILSDIRi386} -XR${SDKi386}" CPU_SOURCE=i386 INSTALL_PREFIX="$TMPINSTALLDIR" install
 
 # Build i386 -> x86-64 cross-compiler
 cd "$FPCBUILD"/fpcsrc
-make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4 -XR${SDKi386}" CROSSOPT="-WM10.5 -XR${SDKx64}" CPU_SOURCE=i386 CPU_TARGET=x86_64 -j $NCPU FPMAKEOPT="-T $CNPU --target=x86_64-darwin" all
-make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4 -XR${SDKi386}" CROSSOPT="-WM10.5 -XR${SDKx64}" CPU_SOURCE=i386 CPU_TARGET=x86_64 INSTALL_PREFIX="$TMPINSTALLDIR" CROSSINSTALL=1 install
+make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4 -FD${BINUTILSDIRi386} -XR${SDKi386}" CROSSOPT="-WM10.6 -FD${BINUTILSDIR} -XR${SDKx64}" CPU_SOURCE=i386 CPU_TARGET=x86_64 -j $NCPU FPMAKEOPT="-T $CNPU --target=x86_64-darwin" all
+make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4 -FD${BINUTILSDIRi386} -XR${SDKi386}" CROSSOPT="-WM10.6 -FD${BINUTILSDIR} -XR${SDKx64}" CPU_SOURCE=i386 CPU_TARGET=x86_64 INSTALL_PREFIX="$TMPINSTALLDIR" CROSSINSTALL=1 install
 mv "$TMPINSTALLDIR"/lib/fpc/$VERSION/ppcrossx64 "$TMPINSTALLDIR"/lib/fpc/$VERSION/ppcx64
 
 # Create fat/universal binaries
@@ -141,15 +148,15 @@ BASECROSSOPT="-ap -FD${BINUTILSDIRppc}"
 # x64 -> ppc
 cd "$FPCBUILD"/fpcsrc
 make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT" distclean -j $NCPU OVERRIDEVERSIONCHECK=1
-make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.5 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM10.4 -XR${SDKppc}" CPU_TARGET=powerpc -j $NCPU FPMAKEOPT="-T $NCPU" all
-make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.5 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM10.4 -XR${SDKppc}" CPU_TARGET=powerpc INSTALL_PREFIX="$InstallDirPPC" CROSSINSTALL=1 install
+make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.6 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM10.4 -XR${SDKppc}" CPU_TARGET=powerpc -j $NCPU FPMAKEOPT="-T $NCPU" all
+make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.6 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM10.4 -XR${SDKppc}" CPU_TARGET=powerpc INSTALL_PREFIX="$InstallDirPPC" CROSSINSTALL=1 install
 cd "$InstallDirPPC"/lib/fpc/$VERSION
 mv ppcrossppc ppcppc
 
 # x64 -> ppc64
 cd "$FPCBUILD"/fpcsrc
-make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.5 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM10.4 -XR${SDKppc64}" CPU_TARGET=powerpc64 -j $NCPU FPMAKEOPT="-T $NCPU" all
-make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.5 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM10.4 -XR${SDKppc64}" CPU_TARGET=powerpc64 INSTALL_PREFIX="$InstallDirPPC" CROSSINSTALL=1 install
+make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.6 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM10.4 -XR${SDKppc64}" CPU_TARGET=powerpc64 -j $NCPU FPMAKEOPT="-T $NCPU" all
+make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.6 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM10.4 -XR${SDKppc64}" CPU_TARGET=powerpc64 INSTALL_PREFIX="$InstallDirPPC" CROSSINSTALL=1 install
 cd "$InstallDirPPC"/lib/fpc/$VERSION
 mv ppcrossppc64 ppcppc64
 
@@ -158,7 +165,7 @@ mv ppcrossppc64 ppcppc64
 cd "$FPCBUILD"/fpcsrc
 make FPC="$InstalledCompilerDir"/ppc386 OPT="$BASEOPT" distclean -j $NCPU OVERRIDEVERSIONCHECK=1
 cd compiler
-make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4 -XR${SDKi386}" CPU_SOURCE=i386 -j $NCPU FPMAKEOPT="-T $CNPU --target=powerpc-darwin" cycle ppuclean powerpc powerpc64
+make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4  -FD${BINUTILSDIRi386} -XR${SDKi386}" CPU_SOURCE=i386 -j $NCPU FPMAKEOPT="-T $CNPU --target=powerpc-darwin" cycle ppuclean powerpc powerpc64
 
 makefatbinary ppcppc "$InstallDirPPC"/lib/fpc/$VERSION/ppcppc
 makefatbinary ppcppc64 "$InstallDirPPC"/lib/fpc/$VERSION/ppcppc64
@@ -170,6 +177,25 @@ ln -sf ../lib/fpc/$VERSION/ppcppc64
 strip ../lib/fpc/$VERSION/ppcppc
 strip ../lib/fpc/$VERSION/ppcppc64
 
+########################################################
+# Build aarch64
+########################################################
+
+BASECROSSOPT="-ap -FD${BINUTILSDIRaarch64}"
+
+
+# x64 -> aarc64
+cd "$FPCBUILD"/fpcsrc
+make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT" distclean -j $NCPU OVERRIDEVERSIONCHECK=1
+make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.14 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM11.0 -XR${SDKaarch64}" CPU_TARGET=aarch64 -j $NCPU FPMAKEOPT="-T $NCPU" all
+make FPC="$InstalledCompilerDir"/ppcx64 OPT="$BASEOPT -WM10.14 -XR${SDKx64}" CROSSOPT="$BASECROSSOPT -WM11.0 -XR${SDKaarch64}" CPU_TARGET=aarch64 INSTALL_PREFIX="$InstallDirX86" CROSSINSTALL=1 install
+cd "$InstallDirX86"/lib/fpc/$VERSION
+mv ppcrossa64 ppca64
+
+# create compiler binary symbolic links
+cd "$InstallDirX86"/bin
+ln -sf ../lib/fpc/$VERSION/ppca64
+
 ##########################
 # Build jvm cross-compiler
 ##########################
@@ -204,14 +230,14 @@ make FPC="$InstalledCompilerDir"/ppcx64 OPT="-ap" CROSSOPT="$BASECROSSOPT" CPU_T
 cd "$FPCBUILD"/fpcsrc
 make FPC="$InstalledCompilerDir"/ppcx64 OPT="-ap" distclean -j $NCPU OVERRIDEVERSIONCHECK=1
 cd compiler
-make FPC="$InstalledCompilerDir/ppcx64" OPT="$BASEOPT -WM10.5 -XR${SDKx64}" -j $NCPU FPMAKEOPT="-T $CNPU" cycle ppuclean jvm
+make FPC="$InstalledCompilerDir/ppcx64" OPT="$BASEOPT -WM10.6 -XR${SDKx64}" -j $NCPU FPMAKEOPT="-T $CNPU" cycle ppuclean jvm
 mv ppcjvm "$InstallDirJVM"/lib/fpc/$VERSION/
 
 # build i386->jvm cross-compiler
 cd "$FPCBUILD"/fpcsrc
 make FPC="$InstalledCompilerDir"/ppc386 OPT="$BASEOPT" distclean -j $NCPU OVERRIDEVERSIONCHECK=1
 cd compiler
-make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4 -XR${SDKi386}" CPU_SOURCE=i386 -j $NCPU FPMAKEOPT="-T $CNPU" cycle ppuclean jvm
+make FPC="$InstalledCompilerDir/ppc386" OPT="$BASEOPT -WM10.4 -FD${BINUTILSDIRi386} -XR${SDKi386}" CPU_SOURCE=i386 -j $NCPU FPMAKEOPT="-T $CNPU" cycle ppuclean jvm
 
 makefatbinary ppcjvm "$InstallDirJVM"/lib/fpc/$VERSION/ppcjvm
 cd "$InstallDirJVM"/bin
diff --git a/install/make-i8086-msdos-unixpackage-3.2.0rc1.sh b/install/make-i8086-msdos-unixpackage-3.2.2.sh
similarity index 53%
rename from install/make-i8086-msdos-unixpackage-3.2.0rc1.sh
rename to install/make-i8086-msdos-unixpackage-3.2.2.sh
index 8d6319ef..6e2da82c 100755
--- a/install/make-i8086-msdos-unixpackage-3.2.0rc1.sh
+++ b/install/make-i8086-msdos-unixpackage-3.2.2.sh
@@ -8,9 +8,10 @@
 
 set -e
 
-FPCVERSION=3.2.0
-FPCRCVERSION=3.2.0rc1
-PACKAGE_VERSION=3.2.0rc1
+FPCVERSION=3.2.2
+FPCRCVERSION=3.2.2
+
+PACKAGE_VERSION=$FPCRCVERSION
 
 CPU_SOURCE=$(fpc -iSP)
 OS_SOURCE=$(fpc -iSO)
@@ -21,10 +22,13 @@ install -d $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCVERSION/units/msdos_
 function build_subarch_mm {
     SUBARCH=$1
     MEMORY_MODEL=$2
-    make -C fpcsrc clean buildbase OS_SOURCE=$OS_SOURCE CPU_SOURCE=$CPU_SOURCE OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="-Wm$MEMORY_MODEL -Cp$SUBARCH"
-    make install CROSSINSTALL=1 INSTALL_PREFIX=$BASEDIR/OUTPUT-MSDOS OS_SOURCE=$OS_SOURCE CPU_SOURCE=$CPU_SOURCE OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="-Wm$MEMORY_MODEL -Cp$SUBARCH" NOGDB=1
+    make -j `nproc` -C fpcsrc clean OS_SOURCE=$OS_SOURCE CPU_SOURCE=$CPU_SOURCE OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="-Wm$MEMORY_MODEL -Cp$SUBARCH"
+    make -j `nproc` -C fpcsrc buildbase OS_SOURCE=$OS_SOURCE CPU_SOURCE=$CPU_SOURCE OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="-Wm$MEMORY_MODEL -Cp$SUBARCH"
+    make -j `nproc` install CROSSINSTALL=1 INSTALL_PREFIX=$BASEDIR/OUTPUT-MSDOS OS_SOURCE=$OS_SOURCE CPU_SOURCE=$CPU_SOURCE OS_TARGET=msdos CPU_TARGET=i8086 OPT="-CX -XXs" BINUTILSPREFIX= CROSSOPT="-Wm$MEMORY_MODEL -Cp$SUBARCH" NOGDB=1
     mv $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCVERSION/units/msdos $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCVERSION/units/msdos_/$SUBARCH-$MEMORY_MODEL
-    mv $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCRCVERSION/units/msdos/rtl $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCVERSION/units/msdos_/$SUBARCH-$MEMORY_MODEL
+    if [ "$FPCVERSION" != "$FPCRCVERSION" ]; then
+        mv $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCRCVERSION/units/msdos/rtl $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCVERSION/units/msdos_/$SUBARCH-$MEMORY_MODEL
+    fi
 }
 
 function build_subarch {
@@ -39,9 +43,12 @@ function build_subarch {
 build_subarch 8086
 build_subarch 80186
 build_subarch 80286
+build_subarch 80386
 
-mv $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCRCVERSION/ppcross8086 $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCVERSION/
-rm -r $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCRCVERSION
+if [ "$FPCVERSION" != "$FPCRCVERSION" ]; then
+    mv $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCRCVERSION/ppcross8086 $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCVERSION/
+    rm -r $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCRCVERSION
+fi
 mv $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCVERSION/units/msdos_ $BASEDIR/OUTPUT-MSDOS/lib/fpc/$FPCVERSION/units/msdos
 rm $BASEDIR/OUTPUT-MSDOS/bin/nasm.exe
 ln -s "../lib/fpc/$FPCVERSION/ppcross8086" $BASEDIR/OUTPUT-MSDOS/bin/ppcross8086
diff --git a/install/makefpcbuild b/install/makefpcbuild
index 5e42df0b..08223fd5 100755
--- a/install/makefpcbuild
+++ b/install/makefpcbuild
@@ -1,22 +1,20 @@
 #!/bin/sh
-
 set -e
 
 if [ $# -eq 1 ]; then
   VERSION=$1
-  SVNTAGVER=`echo $VERSION | tr '.' '_'`
-  SVNPATH="tags/release_$SVNTAGVER"
-elif [ $# -eq 3 ] && [ $1 = "-svnpath" ]; then
-  SVNPATH=$2
+  GITTAGVER=`echo $VERSION | tr '.' '_'`
+  GITTAG="release_$GITTAGVER"
+elif [ $# -eq 3 ] && [ $1 = "-gittag" ]; then
+  GITTAG=$2
   VERSION=$3
 else
-  echo "Usage: makefpcbuild [-svnpath <svnpath>] <release>"
-  echo "Examples: makefpcbuild -svnpath branches/fixes_2_2 2.2.3"
-  echo "          makefpcbuild 2.2.4"
+  echo "Usage: $0 [-gittag <tag>] <release>"
+  echo "Examples: $0 -gittag release_3_2_4-branch 3.2.4-rc1"
+  echo "          $0 2.2.4"
   exit 1
 fi
 
-
 PACKNAME=fpcbuild-$VERSION
 OUTPUTDIR=..
 
@@ -27,19 +25,32 @@ cd buildsrc
 
 rm -f $OUTPUTDIR/$PACKNAME.tar.gz $OUTPUTDIR/$PACKNAME.zip
 
-svn co http://svn.freepascal.org/svn/fpcbuild/$SVNPATH fpcbuild
+GITREPO=https://gitlab.com/freepascal.org/fpc/build.git
 
-#find -name .svn -type d | xargs tar --remove-files -cvzf $OUTPUTDIR/SVNfiles-$VERSION.tar.gz 
+git clone --depth 1 --recurse-submodules --branch $GITTAG $GITREPO fpcbuild-$VERSION
+for repos in fpcbuild-$VERSION fpcbuild-$VERSION/fpcsrc fpcbuild-$VERSION/fpcdocs; do
+  CURPATH=`pwd`
+  cd $repos
+  git config core.eol crlf
+  cd $CURPATH
+done
 
-svn export fpcbuild fpcbuild-$VERSION --native-eol CRLF
-# Do not add the logs to the source-package
-rm -rf fpcbuild-$VERSION/logs
-zip -D9r $OUTPUTDIR/$PACKNAME.zip fpcbuild-$VERSION
+cd fpcbuild-$VERSION 
+git ls-files -z --recurse-submodules | xargs -0 rm
+git checkout . --recurse-submodules
+cd ..
 
+for repos in fpcbuild-$VERSION fpcbuild-$VERSION/fpcsrc fpcbuild-$VERSION/fpcdocs; do
+  rm -rf $repos/.git
+done 
+zip -D9r $OUTPUTDIR/$PACKNAME.zip fpcbuild-$VERSION
 rm -rf fpcbuild-$VERSION
 
-svn export fpcbuild fpcbuild-$VERSION
-rm -rf fpcbuild-$VERSION/logs
+git clone --depth 1 --recurse-submodules --branch $GITTAG $GITREPO fpcbuild-$VERSION
+for repos in fpcbuild-$VERSION fpcbuild-$VERSION/fpcsrc fpcbuild-$VERSION/fpcdocs; do
+  rm -rf $repos/.git
+done
 tar cfv - fpcbuild-$VERSION/ | gzip > $OUTPUTDIR/$PACKNAME.tar.gz
+
 cd ..
 rm -rf buildsrc
diff --git a/install/makefpcbuild-svn b/install/makefpcbuild-svn
new file mode 100755
index 00000000..5e42df0b
--- /dev/null
+++ b/install/makefpcbuild-svn
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+set -e
+
+if [ $# -eq 1 ]; then
+  VERSION=$1
+  SVNTAGVER=`echo $VERSION | tr '.' '_'`
+  SVNPATH="tags/release_$SVNTAGVER"
+elif [ $# -eq 3 ] && [ $1 = "-svnpath" ]; then
+  SVNPATH=$2
+  VERSION=$3
+else
+  echo "Usage: makefpcbuild [-svnpath <svnpath>] <release>"
+  echo "Examples: makefpcbuild -svnpath branches/fixes_2_2 2.2.3"
+  echo "          makefpcbuild 2.2.4"
+  exit 1
+fi
+
+
+PACKNAME=fpcbuild-$VERSION
+OUTPUTDIR=..
+
+rm -rf buildsrc
+
+mkdir buildsrc
+cd buildsrc
+
+rm -f $OUTPUTDIR/$PACKNAME.tar.gz $OUTPUTDIR/$PACKNAME.zip
+
+svn co http://svn.freepascal.org/svn/fpcbuild/$SVNPATH fpcbuild
+
+#find -name .svn -type d | xargs tar --remove-files -cvzf $OUTPUTDIR/SVNfiles-$VERSION.tar.gz 
+
+svn export fpcbuild fpcbuild-$VERSION --native-eol CRLF
+# Do not add the logs to the source-package
+rm -rf fpcbuild-$VERSION/logs
+zip -D9r $OUTPUTDIR/$PACKNAME.zip fpcbuild-$VERSION
+
+rm -rf fpcbuild-$VERSION
+
+svn export fpcbuild fpcbuild-$VERSION
+rm -rf fpcbuild-$VERSION/logs
+tar cfv - fpcbuild-$VERSION/ | gzip > $OUTPUTDIR/$PACKNAME.tar.gz
+cd ..
+rm -rf buildsrc
diff --git a/install/makepack b/install/makepack
index 5b47d3cc..ec5810be 100755
--- a/install/makepack
+++ b/install/makepack
@@ -4,7 +4,22 @@
 # Copyright 1996-2004 Michael Van Canneyt and Peter Vreman
 #
 
-set -e
+# set -e
+
+
+# Parse all args with XX=VALUE
+check_next_arg=1
+
+while [ $check_next_arg -eq 1 ] ; do
+  check_next_arg=0
+  arg="$1"
+  if [ "${arg/=/_}" != "${arg}" ] ; then
+    echo "Adding MAKEPACK_${arg} variable"
+    eval export "\"MAKEPACK_${arg}\""
+    shift
+    check_next_arg=1
+  fi
+done
 
 # Set this to "yes" if you want to force making the documentation.
 # if it is not equal to yes, the documentation is assumed present in a file doc-pdf.tar.gz
@@ -48,25 +63,47 @@ MAKE=make
 TAR=tar
 
 case "$HOSTOS" in
- *freebsd*) MAKE=gmake
-	EXTRAOPT+=" -Fl/usr/local/lib -Fl/usr/X11R6/lib  -dFREEBSD5"
+  *freebsd*) MAKE=gmake
+    if [ -d /usr/local/lib ] ; then
+      EXTRAOPT+=" -Fl/usr/local/lib"
+    fi
+    if [ -d /usr/X11R6/lib ] ; then
+      EXTRAOPT+=" -Fl/usr/X11R6/lib"
+    fi
+    EXTRAOPT+=" -dFREEBSD5"
   ;;
- *netbsd*) MAKE=gmake
-	EXTRAOPT+=" -Fl/usr/pkg/lib"
+  *netbsd*) MAKE=gmake
+    if [ -d /usr/pkg/lib ] ; then
+      EXTRAOPT+=" -Fl/usr/pkg/lib"
+    fi
   ;;
 
- *sunos*) MAKE=gmake
-     # Use system linker if on solaris machine
-     if [ "$SOURCEOS" == "solaris" ]; then
-       EXTRAOPT+=" -Xn"
-     fi
-     # Use GNU tar if present
-     if [ "`which gtar`" != "" ]; then
-       TAR=`which gtar`
-     fi
- ;;
- *openbsd*) MAKE=gmake
-	EXTRAOPT+=" -Fl/usr/local/lib"
+  *linux*) 
+    if [ "$SOURCECPU" = "i386" ] ; then
+      if [ -d /lib32 ] ; then
+        EXTRAOPT+=" -Fl/lib32"
+      fi
+      if [ -d /usr/lib32 ] ; then
+        EXTRAOPT+=" -Fl/usr/lib32"
+      fi
+    fi 
+  ;;
+  *sunos*)
+    MAKE=gmake
+    # Use system linker if on solaris machine
+    if [ "$SOURCEOS" == "solaris" ]; then
+      EXTRAOPT+=" -Xn"
+    fi
+    # Use GNU tar if present
+    if [ "`which gtar`" != "" ]; then
+      TAR=`which gtar`
+    fi
+  ;;
+  *openbsd*)
+    MAKE=gmake
+    if [ -d /usr/local/lib ] ; then
+      EXTRAOPT+=" -Fl/usr/local/lib"
+    fi
   ;;
 esac
 
@@ -86,63 +123,64 @@ fi
 # Retrieve GDBMI_DEFAULT_OS_LIST from Makefile.fpc
 GDBMI_DEFAULT_OS_LIST=`grep '^GDBMI_DEFAULT_OS_LIST *=' Makefile.fpc | sed 's+[^=]*= *\(.*\)+\1+'`
 
-# Use of GDBMI for text mode IDE, starting with version 3.1.1
-if  [ "X${VERSION#3.0.}" == "X${VERSION}" ] ; then
-  if  [ "X${NOGDB}" == "X" ] ; then
-#  Determine if we should use GDBMI for Text Mode IDE compilation
-    if [ "X${NOGDBMI}" == "X" ]; then
-      if [ "X${GDBMI_DEFAULT_OS_LIST/%{TARGETOS}}" != "X${GDBMI_DEFAULT_LIST}" ] ; then
-        echo "Use GDBMI"
-        export GDBMI=1
-      fi
+# Use of GDBMI for text mode IDE, if in GDBMI_DEFAULT_OS_LIST
+if  [ "X${NOGDB}" == "X" ] ; then
+  #  Determine if we should use GDBMI for Text Mode IDE compilation
+  if [ "X${NOGDBMI}" == "X" ]; then
+    if [ "X${GDBMI_DEFAULT_OS_LIST/%{TARGETOS}}" != "X${GDBMI_DEFAULT_LIST}" ] ; then
+      echo "Building text mode IDE using GDBMI"
+      export GDBMI=1
     fi
-  fi #NOGDB
-fi #Not 3.0.X version
+  fi
+fi #NOGDB
 
 if [ "X${GDBMI}" != "X" ] ; then
-if [ "X${GDBMI}" == "X0" ] ; then
-if [ "$CHECKLIBGDB" = "" ]; then
-  CHECKLIBGDB=yes
-fi
-else
-CHECKLIBGDB=no
-fi
+  if [ "X${GDBMI}" == "X0" ] ; then
+    if [ "$CHECKLIBGDB" = "" ]; then
+      CHECKLIBGDB=yes
+    fi
+  else
+    CHECKLIBGDB=no
+  fi
 else
-if [ "$CHECKLIBGDB" = "" ]; then
-  CHECKLIBGDB=yes
-fi
+  if [ "$CHECKLIBGDB" = "" ]; then
+    CHECKLIBGDB=yes
+  fi
 fi
 
 FULLTARGET=$TARGETCPU-$TARGETOS
 FULLSOURCE=$SOURCECPU-$SOURCEOS
 
+# Set this variable to 1 if BUILDFULLNATIVE is passed
+FULLNATIVE_CROSS=0
+
 echo "FPC Source: $FULLSOURCE"
 echo "FPC Target: $FULLTARGET"
 
 # Cross building
 #  - add prefix
-#  - no IDE
-if [ "$FULLTARGET" != "$FULLSOURCE" ]; then
-   CROSS="cross"
-   CROSSPREFIX=$FULLTARGET-
-   IDE=
+if [ "X$MAKEPACK_BUILDFULLNATIVE" == "X1" ] ; then
+  CROSS=
+  CROSSPREFIX=
+  FULLSUFFIX=$FULLTARGET
+  if [ "$FULLTARGET" != "$FULLSOURCE" ]; then
+    FULLNATIVE_CROSS=1
+  fi
+elif [ "$FULLTARGET" != "$FULLSOURCE" ]; then
+  CROSS="cross"
+  CROSSPREFIX=$FULLTARGET-
+  FULLSUFFIX=$FULLSOURCE
 else
-   CROSS=
-   CROSSPREFIX=
-   # Starting with version 3.1.1, the IDE is not a separate part anymore, but part of utils
-   if [ "X${VERSION#3.0.}" != "X${VERSION}" ] ; then
-     # Version 3.0.x, add the IDE as separate part
-     export IDE=ide
-   else
-     export IDE=
-   fi
+  CROSS=
+  CROSSPREFIX=
+  FULLSUFFIX=$FULLTARGET
 fi
 
 
 # Check for libgdb.a
-if [ "$CROSS" = "" ]; then
-  if [ "$CHECKLIBGDB" = "yes" ]; then
-    if [ "$GDBLIBDIR" = "" ]; then
+if [ "$XCROSS" == "X" ]; then
+  if [ "X$CHECKLIBGDB" == "Xyes" ]; then
+    if [ "X$GDBLIBDIR" == "X" ]; then
       GDBLIBDIR=fpcsrc/libgdb/$TARGETOS/$TARGETCPU
     fi
     if [ ! -e "$GDBLIBDIR/libgdb.a" ]; then
@@ -157,7 +195,7 @@ if [ "$CROSS" = "" ]; then
 fi
 
 # First check for doc-pdf.tar.gz before building anything
-if [ "$CROSS" = "" ]; then
+if [ "X$CROSS" == "X" ]; then
   if [ ! -f doc-pdf.tar.gz ]; then
     if [ "$MAKEDOCS" != "yes" ]; then
       echo "No documentation available. Please copy the file doc-pdf.tar.gz to this directory."
@@ -188,21 +226,29 @@ if [[ ( "$FULLSOURCE" == "powerpc-linux" ) && ( -z "$CROSS" ) ]]; then
   export FPMAKE_SKIP_CONFIG="-n -XPpowerpc-linux-"
 fi
 
-if [ -z "$GCC" ] ; then
-  GCC=`which gcc`
+if [[ ( "$FULLSOURCE" == "x86_64-linux" ) && ( "$FULLTARGET" == "i386-linux" ) ]]; then
+  export TEST_BINUTILSPREFIX=i386-linux-
+  export BINUTILSPREFIX=i386-linux-
+  GCC_EXTRA_OPTS="$GCC_EXTRA_OPTS -m32"
+  export EXTRAOPT="${EXTRAOPT} -Xd -Fl/usr/lib32 -Fl/lib32 -Fd"
 fi
 
-if [ -n "$GCC" ] ; then
-  LIBGCC_FILENAME=`gcc -print-libgcc-file-name $GCC_EXTRA_OPTS`
-  LIBGCC_DIR=`dirname $LIBGCC_FILENAME`
-  if [ -d "$LIBGCC_DIR" ] ; then
-    echo "Adding $LIBGCC_DIR directory to library directory list"
-    export EXTRAOPT="${EXTRAOPT} -Fl$LIBGCC_DIR"
+if [[ ( "$FULLSOURCE" == "$FULLTARGET" ) || ( -n "$GCC_EXTRA_OPTS" ) ]] ; then
+  if [ -z "$GCC" ] ; then
+    GCC=`which gcc`
+  fi
+  if [ -n "$GCC" ] ; then
+    LIBGCC_FILENAME=`gcc -print-libgcc-file-name $GCC_EXTRA_OPTS`
+    LIBGCC_DIR=`dirname $LIBGCC_FILENAME`
+    if [ -d "$LIBGCC_DIR" ] ; then
+      echo "Adding libgcc LIBGCC_DIR directory to library directory list"
+      export EXTRAOPT="${EXTRAOPT} -Fl$LIBGCC_DIR"
+    fi
   fi
 fi
 
 # check existence of binutils if cross packing
-if [ ! "$CROSS" = "" ]; then
+if [ "X$CROSS" != "X" ]; then
   if [ ! -f binutils-${CROSSPREFIX}$FULLSOURCE.tar.gz ]; then
     echo "No cross binutils available: binutils-${CROSSPREFIX}$FULLSOURCE.tar.gz missing."
     exit 1
@@ -218,8 +264,8 @@ fi
 # Build everything using the makefiles
 echo "Starting ${MAKE} distclean CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS FPC=$FPC"
 ${MAKE} distclean CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS FPC=$FPC
-echo "Starting ${MAKE} ${CROSS}zipinstall CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS OPT="${EXTRAOPT}" FPC_VERSION=$VERSION FPC=$FPC $MAKE_EXTRA"
-${MAKE} ${CROSS}zipinstall CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS OPT="${EXTRAOPT}" FPC_VERSION=$VERSION FPC=$FPC $MAKE_EXTRA
+echo "Starting ${MAKE} ${CROSS}zipinstall CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS OPTNEW=\"${EXTRAOPT}\" CROSSOPT=\"$CROSSOPT $EXTRAOPT\" FPC_VERSION=$VERSION FPC=$FPC $MAKE_EXTRA"
+${MAKE} ${CROSS}zipinstall CPU_TARGET=$TARGETCPU OS_TARGET=$TARGETOS OPTNEW="${EXTRAOPT}" CROSSOPT="$CROSSOPT $EXTRAOPT" FPC_VERSION=$VERSION FPC=$FPC $MAKE_EXTRA
 if [ $? != 0 ]; then
   echo "Failed to make distribution archive."
   exit 1
@@ -229,7 +275,7 @@ fi
 RELFILES="install.sh"
 
 # install.sh
-echo "Copying install.sh"
+echo "Copying install.sh, substituting version strings"
 sed -e s+%version%+$VERSION+ -e s+%fullversion%+$FULLVERSION+ install/install.sh > install.sh
 chmod 755 install.sh
 
@@ -238,17 +284,38 @@ cp install/doc/readme.txt .
 chmod 644 readme.txt
 
 # binary.*.tar
-BINARYTAR=${CROSSPREFIX}binary.$FULLSOURCE.tar
+BINARYTAR=${CROSSPREFIX}binary.$FULLSUFFIX.tar
 echo "Creating $BINARYTAR"
-BINPACKAGES="base $IDE units utils"
+BINPACKAGES="base units utils"
 BINFILES=
 for p in $BINPACKAGES; do
-  BINFILES="$BINFILES ${CROSSPREFIX}$p*.$FULLSOURCE.tar.gz"
+  PATTERN="${CROSSPREFIX}$p*$FULLSUFFIX.tar.gz"
+  p_files=`ls -1  $PATTERN 2> /dev/null`
+  if [ -z "$p_files" ] ; then
+    PATTERN=$p*$FULLTARGET.tar.gz
+    p_files=`ls -1  $PATTERN 2> /dev/null`
+  fi
+  if [ ! -z "$p_files" ] ; then
+    BINFILES+=" $PATTERN"
+  else
+    if [ "$p" = "base" ] ; then
+      if [ -f "${FULLTARGET}-base.$FULLSOURCE.tar.gz" ] ;then
+        BINFILES+=" ${FULLTARGET}-base.$FULLSOURCE.tar.gz"
+      fi
+    fi
+  fi
 done
+
+echo "${TAR} cf $BINARYTAR $BINFILES"
 ${TAR} cf $BINARYTAR $BINFILES
-if [ $? != 0 ]; then
-  echo "Failed to create $BINARYTAR"
-  exit 1
+tarres=$?
+if [ $tarres != 0 ]; then
+  if [ ! -f "$BINARYTAR" ] ; then
+    echo "Failed to create $BINARYTAR"
+    exit 1
+  else
+    echo "$TAR returned error=$tarres"
+  fi
 fi
 RELFILES="$RELFILES $BINARYTAR"
 
@@ -263,7 +330,7 @@ else
 fi
 
 # Files to be added to the .tar
-DIRNAME=${CROSSPREFIX}fpc-$FULLVERSION.$FULLSOURCE
+DIRNAME=${CROSSPREFIX}fpc-$FULLVERSION.$FULLSUFFIX
 TARNAME=${DIRNAME}.tar
 echo "Creating $TARNAME"
 # Erase directory if it exists
@@ -278,9 +345,14 @@ fi
 mkdir $DIRNAME
 mv $RELFILES $DIRNAME
 ${TAR} cf $TARNAME $DIRNAME
-if [ $? != 0 ]; then
-  echo "Failed to create $TARNAME"
-  exit 1
+tarres=$?
+if [ $tarres != 0 ]; then
+  if [! -f "$TARNAME" ] ; then
+    echo "Failed to create $TARNAME"
+    exit 1
+  else
+    echo "$TAR returned error=$tarres"
+  fi
 else
   echo "Successfully created `pwd`/$TARNAME"
 fi
diff --git a/install/makesource b/install/makesource
index f1183128..45c7c4a0 100755
--- a/install/makesource
+++ b/install/makesource
@@ -4,14 +4,14 @@ set -e
 
 if [ $# -eq 1 ]; then
   VERSION=$1
-  SVNTAGVER=`echo $VERSION | tr '.' '_'`
-  SVNPATH="tags/release_$SVNTAGVER"
-elif [ $# -eq 3 ] && [ $1 = "-svnpath" ]; then
-  SVNPATH=$2
+  GITTAGVER=`echo $VERSION | tr '.' '_'`
+  GITTAG="release_$GITTAGVER"
+elif [ $# -eq 3 ] && [ $1 = "-gittag" ]; then
+  GITTAG=$2
   VERSION=$3
 else
-  echo "Usage: makesource [-svnpath <svnpath>] <release>"
-  echo "Examples: makesource -svnpath branches/release_2_2_4_rc1 2.2.4rc1"
+  echo "Usage: makesource [-gittag <tag>] <release>"
+  echo "Examples: makesource -gittag release_3_2_4-branch 3.2.4-rc1"
   echo "          makesource 2.2.4"
   exit 1
 fi
@@ -23,16 +23,22 @@ rm -rf buildsrc
 
 mkdir buildsrc
 cd buildsrc
-svn co http://svn.freepascal.org/svn/fpc/$SVNPATH fpc
 
-find -name .svn -type d | xargs tar -cvzf $OUTPUTDIR/SVNfiles-$VERSION.tar.gz 
+GITREPO=https://gitlab.com/freepascal.org/fpc/source.git
+git clone --depth 1 --branch $GITTAG $GITREPO fpc-$VERSION
 
-svn export fpc fpc-$VERSION --native-eol CRLF
 rm -f $OUTPUTDIR/$PACKNAME.tar.gz $OUTPUTDIR/$PACKNAME.zip
+cd fpc-$VERSION
+git config core.eol crlf
+git ls-files -z | xargs -0 rm
+git checkout .
+rm -rf .git
+cd ..
 zip -D9r $OUTPUTDIR/$PACKNAME.zip fpc-$VERSION
 
 rm -rf fpc-$VERSION
-svn export fpc fpc-$VERSION
+git clone --depth 1 --branch $GITTAG $GITREPO fpc-$VERSION
+rm -rf fpc-$VERSION/.git
 tar cfv - fpc-$VERSION/ | gzip > $OUTPUTDIR/$PACKNAME.tar.gz
 cd ..
 rm -rf buildsrc
diff --git a/install/makesource-svn b/install/makesource-svn
new file mode 100755
index 00000000..f1183128
--- /dev/null
+++ b/install/makesource-svn
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -e
+
+if [ $# -eq 1 ]; then
+  VERSION=$1
+  SVNTAGVER=`echo $VERSION | tr '.' '_'`
+  SVNPATH="tags/release_$SVNTAGVER"
+elif [ $# -eq 3 ] && [ $1 = "-svnpath" ]; then
+  SVNPATH=$2
+  VERSION=$3
+else
+  echo "Usage: makesource [-svnpath <svnpath>] <release>"
+  echo "Examples: makesource -svnpath branches/release_2_2_4_rc1 2.2.4rc1"
+  echo "          makesource 2.2.4"
+  exit 1
+fi
+
+PACKNAME=fpc-$VERSION.source
+OUTPUTDIR=..
+
+rm -rf buildsrc
+
+mkdir buildsrc
+cd buildsrc
+svn co http://svn.freepascal.org/svn/fpc/$SVNPATH fpc
+
+find -name .svn -type d | xargs tar -cvzf $OUTPUTDIR/SVNfiles-$VERSION.tar.gz 
+
+svn export fpc fpc-$VERSION --native-eol CRLF
+rm -f $OUTPUTDIR/$PACKNAME.tar.gz $OUTPUTDIR/$PACKNAME.zip
+zip -D9r $OUTPUTDIR/$PACKNAME.zip fpc-$VERSION
+
+rm -rf fpc-$VERSION
+svn export fpc fpc-$VERSION
+tar cfv - fpc-$VERSION/ | gzip > $OUTPUTDIR/$PACKNAME.tar.gz
+cd ..
+rm -rf buildsrc
diff --git a/install/man/man1/fpc.1 b/install/man/man1/fpc.1
index 38934d50..7ab39a36 100644
--- a/install/man/man1/fpc.1
+++ b/install/man/man1/fpc.1
@@ -101,11 +101,7 @@ Returns the target Processor.
 .RE
 .TP
 .I \-l
-This option tells the compiler to print the
-.I FPC
-logo on standard output. It also gives you the
-.I FPC
-version number.
+At the top print a line stating which program this is and its version.
 .TP
 .I \-n
 Tells the compiler not to read the configuration file
@@ -616,9 +612,8 @@ Asm blocks contain AT&T assembler.
 .I intel
 Asm blocks contain Intel assembler.
 .TP
-.I direct
-Asm blocks should be copied as-is in the assembler
-file.
+.I default
+Use default assembler for the selected platform.
 .RE
 .TP
 .BI \-S2
diff --git a/install/man/man5/fpc.cfg.5 b/install/man/man5/fpc.cfg.5
index 97e8231a..60c43f52 100644
--- a/install/man/man5/fpc.cfg.5
+++ b/install/man/man5/fpc.cfg.5
@@ -13,7 +13,7 @@ All commandline options of the compiler (described in
 When the configuration file is found, it is read, and the lines
 it contains are treated like you typed them on the command line see
 .BR fpc (1)
-with some extra condtional possibilities.
+with some extra conditional possibilities.
 
 .SH SYNTAX
 
@@ -280,7 +280,7 @@ A standard block often used in (the Linux version of) fpc.cfg is
 #ENDIF
 .PP
 The block is copied into the fpc.cfg file for each version you use (normally
-the latest release  and the lastest developpers
+the latest release  and the lastest developers
 snapshot.
 
 .SH SEE ALSO
diff --git a/install/man/man5/fpcmake.5 b/install/man/man5/fpcmake.5
index 3b274816..772dc12a 100644
--- a/install/man/man5/fpcmake.5
+++ b/install/man/man5/fpcmake.5
@@ -133,7 +133,7 @@ you wish to have. Do not insert 'default rules' here.
 .TP
 .B sections
 Here you can specify which 'rule sections' should be included in the Makefile. 
-The sections consist of a series of boolean keywords; each keyword decies
+The sections consist of a series of boolean keywords; each keyword decides
 whether a particular section will be written to the makefile. By default,
 all sections are written.
  
diff --git a/install/man/man5/ptop.cfg.5 b/install/man/man5/ptop.cfg.5
index fd58a00b..2f98d706 100644
--- a/install/man/man5/ptop.cfg.5
+++ b/install/man/man5/ptop.cfg.5
@@ -91,7 +91,7 @@ crbefore\	\	\	force CR before keyword
 .br
 blinbefore\	\	blank line before keyword.
 .br
-dindonkey\	\	\	de\-indent on assiociated keywords (see below)
+dindonkey\	\	\	de\-indent on associated keywords (see below)
 .br
 dindent\	\	\	de\-indent (always)
 .br
diff --git a/install/updfpmkver b/install/updfpmkver
index ab6a19e9..ed40b75e 100755
--- a/install/updfpmkver
+++ b/install/updfpmkver
@@ -10,6 +10,6 @@ fi
 
 NEWVER="$1"
 
-find -name fpmake.pp\
+find . -name fpmake.pp\
 	-exec sed -i -e "s/Version:=.*/Version:='${NEWVER}';/" '{}' ';'
 
diff --git a/install/updmkver b/install/updmkver
index 5b03010c..f966677d 100755
--- a/install/updmkver
+++ b/install/updmkver
@@ -16,10 +16,9 @@ else
 	FPCMAKE="$2"
 fi
 
-find -name Makefile.fpc\
+find . -name Makefile.fpc\
 	-exec sed -i -e 's/^version=.*/version='"${NEWVER}"'/' '{}' ';'\
 	-exec "${FPCMAKE}" -q -Tall '{}' ';'
 
-find -name Makefile.fpc.fpcmake\
+find . -name Makefile.fpc.fpcmake\
 	-exec sed -i -e 's/^version=.*/version='"${NEWVER}"'/' '{}' ';'
-