[patch] gcc 10 patch

fnocommon.diff (text/plain), 7.13 KB, created by inasprecali on 2020-08-11 17:56:01 UTC

From 185dc1a00e7492f8be98e5f93b561758423595f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=81nis=20D=C5=BEeri=C5=86=C5=A1?=
 <[e-mail]>
Date: Sat, 23 May 2020 16:18:32 +0300
Subject: [PATCH 1/4] Move global variable definitions to .c files

---
 lisp-kernel/area.h        |  2 +-
 lisp-kernel/gc-common.c   |  1 +
 lisp-kernel/gc.h          | 29 ++++++++++++++---------------
 lisp-kernel/pmcl-kernel.c |  2 ++
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/lisp-kernel/area.h b/lisp-kernel/area.h
index 1ae46aa4..3e74e8db 100644
--- a/lisp-kernel/area.h
+++ b/lisp-kernel/area.h
@@ -108,7 +108,7 @@ Boolean grow_dynamic_area(natural);
 Boolean shrink_dynamic_area(natural);
 
 /* serialize add_area/remove_area, and also the tcr queue */
-void *tcr_area_lock;
+extern void *tcr_area_lock;
 
 #define reserved_area ((area *)(all_areas))
 #define active_dynamic_area ((area *)(reserved_area->succ))
diff --git a/lisp-kernel/gc-common.c b/lisp-kernel/gc-common.c
index 5a00264b..9f3b7b33 100644
--- a/lisp-kernel/gc-common.c
+++ b/lisp-kernel/gc-common.c
@@ -92,6 +92,7 @@ LispObj GCarealow = 0, GCareadynamiclow = 0;
 natural GCndnodes_in_area = 0, GCndynamic_dnodes_in_area = 0;
 LispObj GCweakvll = (LispObj)NULL;
 LispObj GCdwsweakvll = (LispObj)NULL;
+LispObj GCfirstunmarked = (LispObj) NULL;
 LispObj GCephemeral_low = 0;
 natural GCn_ephemeral_dnodes = 0;
 natural GCstack_limit = 0;
diff --git a/lisp-kernel/gc.h b/lisp-kernel/gc.h
index 0aa31ba6..acc9e184 100644
--- a/lisp-kernel/gc.h
+++ b/lisp-kernel/gc.h
@@ -62,8 +62,8 @@
 extern LispObj GCarealow, GCareadynamiclow;
 extern natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
 extern bitvector GCmarkbits, GCdynamic_markbits,managed_static_refbits,global_refidx,dynamic_refidx,managed_static_refidx;
-LispObj *global_reloctab, *GCrelocptr;
-LispObj GCfirstunmarked;
+extern LispObj *global_reloctab, *GCrelocptr;
+extern LispObj GCfirstunmarked;
 
 extern natural lisp_heap_gc_threshold;
 extern natural lisp_heap_notify_threshold;
@@ -153,19 +153,19 @@ void report_paging_info_delta(FILE*, paging_info *, paging_info *);
 #define GC_TRAP_FUNCTION_FREEZE 129
 #define GC_TRAP_FUNCTION_THAW 130
 
-Boolean GCDebug, GCverbose, just_purified_p;
-bitvector GCmarkbits, GCdynamic_markbits;
-LispObj GCarealow, GCareadynamiclow;
-natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
-LispObj GCweakvll,GCdwsweakvll;
-LispObj GCephemeral_low;
-natural GCn_ephemeral_dnodes;
-natural GCstack_limit;
+extern Boolean GCDebug, GCverbose, just_purified_p;
+extern bitvector GCmarkbits, GCdynamic_markbits;
+extern LispObj GCarealow, GCareadynamiclow;
+extern natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
+extern LispObj GCweakvll, GCdwsweakvll;
+extern LispObj GCephemeral_low;
+extern natural GCn_ephemeral_dnodes;
+extern natural GCstack_limit;
 
 #if WORD_SIZE == 64
-unsigned short *_one_bits;
+extern unsigned short *_one_bits;
 #else
-const unsigned char _one_bits[256];
+extern const unsigned char _one_bits[256];
 #endif
 
 #define one_bits(x) _one_bits[x]
@@ -195,11 +195,10 @@ void gc(TCR *, signed_natural);
 /* backend-interface */
 
 typedef void (*weak_mark_fun) (LispObj);
-weak_mark_fun mark_weak_htabv, dws_mark_weak_htabv;
+extern weak_mark_fun mark_weak_htabv, dws_mark_weak_htabv;
 
 typedef void (*weak_process_fun)(void);
-
-weak_process_fun markhtabvs;
+extern weak_process_fun markhtabvs;
 
 
 #define hash_table_vector_header_count (sizeof(hash_table_vector_header)/sizeof(LispObj))
diff --git a/lisp-kernel/pmcl-kernel.c b/lisp-kernel/pmcl-kernel.c
index f348b2b1..5aa9c04a 100644
--- a/lisp-kernel/pmcl-kernel.c
+++ b/lisp-kernel/pmcl-kernel.c
@@ -151,6 +151,8 @@ wperror(char* message)
 
 LispObj lisp_nil = (LispObj) 0;
 bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;
+LispObj *global_reloctab = (LispObj) NULL, *GCrelocptr = (LispObj) NULL;
+void *tcr_area_lock = NULL;
 
 
 /* These are all "persistent" : they're initialized when

From 997de91062d1f152d0c3b322a1e3694243e4a403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=81nis=20D=C5=BEeri=C5=86=C5=A1?=
 <[e-mail]>
Date: Sat, 23 May 2020 16:19:26 +0300
Subject: [PATCH 2/4] Remove unused variables

---
 lisp-kernel/gc.h      | 1 -
 lisp-kernel/threads.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lisp-kernel/gc.h b/lisp-kernel/gc.h
index acc9e184..58a4f227 100644
--- a/lisp-kernel/gc.h
+++ b/lisp-kernel/gc.h
@@ -83,7 +83,6 @@ void gc(TCR *, signed_natural);
 int change_hons_area_size(TCR *, signed_natural);
 void delete_protected_area(protected_area_ptr);
 Boolean egc_control(Boolean, BytePtr);
-Boolean free_segments_zero_filled_by_OS;
 Boolean new_heap_segment(ExceptionInformation *, natural, Boolean , TCR *, Boolean *);
 void platform_new_heap_segment(ExceptionInformation *, TCR*, BytePtr, BytePtr);
 /* an type representing 1/4 of a natural word */
diff --git a/lisp-kernel/threads.h b/lisp-kernel/threads.h
index 4a79fa21..06da1227 100644
--- a/lisp-kernel/threads.h
+++ b/lisp-kernel/threads.h
@@ -187,7 +187,6 @@ void tsd_set(LispObj, void *);
 void *tsd_get(LispObj);
 TCR *new_tcr(natural, natural);
 void thread_init_tcr(TCR *tcr, void *stack_base, natural stack_size);
-TCR *initial_thread_tcr;
 
 #define DEFAULT_THREAD_STACK_SIZE ((size_t) -1)
 #define MINIMAL_THREAD_STACK_SIZE ((size_t) 0)

From 622c8612301e8a95cab91279155bfb04410f2f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=81nis=20D=C5=BEeri=C5=86=C5=A1?=
 <[e-mail]>
Date: Tue, 26 May 2020 11:49:26 +0300
Subject: [PATCH 3/4] Don't introduce new warnings

---
 lisp-kernel/pmcl-kernel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp-kernel/pmcl-kernel.c b/lisp-kernel/pmcl-kernel.c
index 5aa9c04a..e474716a 100644
--- a/lisp-kernel/pmcl-kernel.c
+++ b/lisp-kernel/pmcl-kernel.c
@@ -151,7 +151,7 @@ wperror(char* message)
 
 LispObj lisp_nil = (LispObj) 0;
 bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;
-LispObj *global_reloctab = (LispObj) NULL, *GCrelocptr = (LispObj) NULL;
+LispObj *global_reloctab = (LispObj) 0, *GCrelocptr = (LispObj) 0;
 void *tcr_area_lock = NULL;
 
 

From 3c9756847a3995331181214753a6e9a2bd48c416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=81nis=20D=C5=BEeri=C5=86=C5=A1?=
 <[e-mail]>
Date: Wed, 27 May 2020 15:03:00 +0300
Subject: [PATCH 4/4] Get rid of the warnings properly

---
 lisp-kernel/pmcl-kernel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp-kernel/pmcl-kernel.c b/lisp-kernel/pmcl-kernel.c
index e474716a..e65e3c38 100644
--- a/lisp-kernel/pmcl-kernel.c
+++ b/lisp-kernel/pmcl-kernel.c
@@ -151,7 +151,7 @@ wperror(char* message)
 
 LispObj lisp_nil = (LispObj) 0;
 bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;
-LispObj *global_reloctab = (LispObj) 0, *GCrelocptr = (LispObj) 0;
+LispObj *global_reloctab = (LispObj*) 0, *GCrelocptr = (LispObj*) 0;
 void *tcr_area_lock = NULL;