trunk/gcc430/vcs_diff_rtl.patch results

File details

./trunk/gcc430/vcs_diff_rtl.patch 2026-11-10-05:26

Used binaries

Binaries version

> uname -a
FreeBSD cfarm430.jing.rocks 16.0-CURRENT FreeBSD 16.0-CURRENT main-n290699-c502df9eb193 GENERIC amd64

Full file content

 
diff --cc rtl/unix/cthreads.pp
index 7ad7759b5f,4ca40a856b..0000000000
--- a/rtl/unix/cthreads.pp
+++ b/rtl/unix/cthreads.pp
@@@ -125,12 -125,21 +125,27 @@@ procedure fpc_threaderror; [external na
  
  Type  PINTRTLEvent = ^TINTRTLEvent;
        TINTRTLEvent = record
+ {$ifdef CHECK_CTHREADS_RECORDS}
+ 	ptr1 : ptruint;
+ {$endif CHECK_CTHREADS_RECORDS}
          condvar: pthread_cond_t;
+ {$ifdef CHECK_CTHREADS_RECORDS}
+ 	ptr2 : ptruint;
+ {$endif CHECK_CTHREADS_RECORDS}
          mutex: pthread_mutex_t;
+ {$ifdef CHECK_CTHREADS_RECORDS}
+ 	ptr3 : ptruint;
+ {$endif CHECK_CTHREADS_RECORDS}
          isset: boolean;
++<<<<<<< HEAD
 +{$if defined(Linux) and not defined(Android)}
 +        clockid: clockid_t;  { clock of condvar }
 +{$ifend}
++=======
+ {$ifdef CHECK_CTHREADS_RECORDS}
+ 	ptr4 : ptruint;
+ {$endif CHECK_CTHREADS_RECORDS}
++>>>>>>> 7591eb1206 (Add debug separation fields to test confusion between RTLEvent and BasicEvent functions families)
         end;
  
        TTryWaitResult = (tw_error, tw_semwasunlocked, tw_semwaslocked);
* Unmerged path rtl/unix/cthreads.pp