U rtl/aarch64/mathu.inc
--- Recording mergeinfo for merge of r46880 into '.':
U .
--- Merging r40512 into '.':
A tests/webtbs/tw33607.pp
--- Recording mergeinfo for merge of r40512 into '.':
G .
--- Merging r42961 into '.':
U compiler/aarch64/aasmcpu.pas
--- Recording mergeinfo for merge of r42961 into '.':
G .
--- Merging r44932 into '.':
G compiler/aarch64/aasmcpu.pas
--- Recording mergeinfo for merge of r44932 into '.':
G .
--- Merging r44933 into '.':
U compiler/aarch64/racpugas.pas
--- Recording mergeinfo for merge of r44933 into '.':
G .
--- Merging r44998 into '.':
U compiler/aarch64/racpu.pas
--- Recording mergeinfo for merge of r44998 into '.':
G .
--- Merging r45667 into '.':
G compiler/aarch64/racpugas.pas
U compiler/rautils.pas
A tests/webtbs/tw37218.pp
--- Recording mergeinfo for merge of r45667 into '.':
G .
--- Merging r45814 into '.':
U compiler/aarch64/rgcpu.pas
A tests/webtbs/tw37393.pp
--- Recording mergeinfo for merge of r45814 into '.':
G .
--- Merging r46690 into '.':
G compiler/aarch64/aasmcpu.pas
--- Recording mergeinfo for merge of r46690 into '.':
G .
--- Merging r46871 into '.':
U compiler/aarch64/cgcpu.pas
--- Recording mergeinfo for merge of r46871 into '.':
G .
git-svn-id: branches/fixes_3_2@47756 -
checks for fpu exceptions for arm and aarch64.
------------------------------------------------------------------------
r42525 | florian | 2019-07-28 21:06:36 +0000 (Sun, 28 Jul 2019) | 2 lines
+ software handling of exceptions on arm
* reworked software handling of exceptions so they can be check lazily
------------------------------------------------------------------------
--- Merging r42525 into '.':
U compiler/arm/cgcpu.pas
U compiler/arm/narmadd.pas
U compiler/arm/narminl.pas
U compiler/arm/narmmat.pas
U compiler/ncgcal.pas
U compiler/procinfo.pas
U rtl/arm/arm.inc
--- Recording mergeinfo for merge of r42525 into '.':
U .
Summary of conflicts:
Tree conflicts: 1
------------------------------------------------------------------------
r42891 | florian | 2019-09-01 17:26:11 +0000 (Sun, 01 Sep 2019) | 1 line
+ support for software floating point exception handling on AArch64 (-CE)
------------------------------------------------------------------------
--- Merging r42891 into '.':
U compiler/aarch64/cgcpu.pas
U compiler/aarch64/ncpuadd.pas
U compiler/aarch64/ncpuinl.pas
U compiler/aarch64/ncpumat.pas
U rtl/aarch64/aarch64.inc
U rtl/aarch64/math.inc
U rtl/aarch64/mathu.inc
--- Recording mergeinfo for merge of r42891 into '.':
G .
git-svn-id: branches/fixes_3_2@46225 -
