Skip to content

Commit 54712a4

Browse files
committed
Merge remote-tracking branch 'origin/fbc-1.10' into master
Conflicts: - resolve src/rtlib/str_core.c by keeping master
2 parents 075f953 + 8708d1a commit 54712a4

File tree

3 files changed

+45
-8
lines changed

3 files changed

+45
-8
lines changed

changelog.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,17 @@ Version 1.10.3
116116
- updated bindings: Windows API - refresh the existing windows headers after retranslating with addition of version 8.1 (&h0603) and windows 10 (&h0A00)
117117
- updated bindings: add machine translated versions of inc/win/excpt.bi and inc/win/sdkddkver.bi
118118
- release: allowing using recipes in the build script to specify which arm bootstrap package to use. Try to determine automatically the host operating system if a recipe is not explicitly given
119+
- release: depend on libtinfo6 in debian 12 since it drops support for libtinfo5
119120

120121
[added]
121-
- makefile: add bootstrap-dist-target to make only a single bootstrap-source-{fbtarget} package to allow variations on the bootstrap requirements for different systems
122+
- makefile: add bootstrap-dist-target to make only a single bootstrap-source-{fbtarget} package to allow variations on the bootstrap requirements for different systems
123+
- release: build recipes for debian11-arm, debian11-armhf, rpios12-armhf, rpios12-aarch64, ubuntu-24.04-aarch64
122124

123125
[fixed]
124126
- github #33: Bi include error in ntdef.bi
125127
- bad code generation of operator cast() UDT ptr passed to byval UDT ptr parameter when matching constructors() are also present
126128
- rtlib/dos: ensure NUL terminating character is written on optimized conversion from ascii to wstring in the event that the copy is truncated - for example copying from a larger temporary string to a fixed length wstring and DISABLE_WCHAR is in use (previously HOST_DOS)
129+
- gcc warnings on newer gcc 12 in rtlib source files
127130

128131

129132
Version 1.10.2

contrib/release/build.sh

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,18 @@
7676
# -winlibs-gcc-10.3.0 (winlibs mingwrt 8.0.0r1)
7777
# -equation-gcc-8.3.0 (Equation - experimental)
7878
# * -linux-arm
79-
# * -raspbian9-arm
79+
# * -debian11-arm
8080
# * -debian12-armhf
81+
# * -raspbian9-arm
8182
# * -rpios10-arm
8283
# * -rpios10-aarch64
8384
# * -rpios11-arm
8485
# * -rpios11-aarch64
86+
# * -rpios12-armhf
87+
# * -rpios12-aarch64
8588
# * -linux-aarch64
8689
# * -ubuntu-22.04-aarch64
90+
# * -ubuntu-24.04-aarch64
8791
#
8892
# Not all recipes are supported on all targets.
8993
#
@@ -739,9 +743,9 @@ case "$named_recipe" in
739743
-debian12-armhf)
740744
# 1.10.2 for arm is a little weird because it depended on changes
741745
# in fbc to make the 1.10.2 bootstrap on debian 12 with gcc 12.
742-
# So, no matter what, we need some manual intervention for this release
743-
# and should improve the automation in the next release
744-
# but it requires some manual intervention to set compile options
746+
# So, no matter what, we need some manual intervention for at least
747+
# one release and should try to find a way to improve the automatic
748+
# selection of a default arch in a future release
745749
#
746750
AppendBOOTFBCFLAGS "DEFAULT_CPUTYPE_ARM=FB_CPUTYPE_ARMV7A_FP"
747751
bootfb_title="FreeBASIC-1.10.2$named_recipe"
@@ -754,12 +758,42 @@ case "$named_recipe" in
754758
AppendBOOTFBCFLAGS "DEFAULT_CPUTYPE_ARM=FB_CPUTYPE_ARMV7A"
755759
bootfb_title="FreeBASIC-1.10.1$named_recipe"
756760
;;
761+
-debian11-arm)
762+
# rpios11-arm should be similar enough to bootstrap debian11-arm
763+
AppendBOOTFBCFLAGS "DEFAULT_CPUTYPE_ARM=FB_CPUTYPE_ARMV7A"
764+
bootfb_title="FreeBASIC-1.10.1-rpios11-arm"
765+
;;
766+
-rpios12-armhf)
767+
# see note for '-debian12-armhf' above since rpios12 is based on debian 12
768+
# build rpios12 using package for debian12
769+
# and set the default arch for armhf
770+
AppendBOOTFBCFLAGS "DEFAULT_CPUTYPE_ARM=FB_CPUTYPE_ARMV7A_FP"
771+
bootfb_title="FreeBASIC-1.10.2-debian12-armhf"
772+
;;
757773
-rpios10-aarch64|-rpios11-aarch64)
758-
bootfb_title="FreeBASIC-1.07.2$named_recipe"
774+
# previously had used "FreeBASIC-1.07.2$named_recipe", but
775+
# sourceforge does not seem to like solving the URL anymore
776+
# seems to work with a newer version of the package
777+
bootfb_title="FreeBASIC-1.10.1$named_recipe"
778+
;;
779+
-rpios12-aarch64)
780+
# build rpios12 using package for rpios11
781+
bootfb_title="FreeBASIC-1.10.1-rpios11-aarch64"
759782
;;
760783
-linux-aarch64|-ubuntu-22.04-aarch64)
761784
bootfb_title="FreeBASIC-1.10.1$named_recipe"
762785
;;
786+
-ubuntu-24.04-aarch64)
787+
# build on ubuntu 24.04 using package for ubuntu 22.04
788+
bootfb_title="FreeBASIC-1.10.1-ubuntu-22.04-aarch64"
789+
;;
790+
-ubuntu-24.04-x86_64)
791+
# ubuntu 24.04 drops support for libtinfo5 and there is no good
792+
# work around for older fbc releases. Instead bootrstrap from
793+
# a package that was built for this version of ubuntu which will
794+
# depend on libtinfo6 instead
795+
bootfb_title="FreeBASIC-1.10.3$named_recipe"
796+
;;
763797
*)
764798
bootfb_title="FreeBASIC-1.06.0-$fbtarget"
765799
;;

src/rtlib/array_redim.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ int fb_hArrayAlloc
1515
size_t i, elements, size;
1616
ssize_t diff;
1717
FBARRAYDIM *dim;
18-
ssize_t lbTB[FB_MAXDIMENSIONS];
19-
ssize_t ubTB[FB_MAXDIMENSIONS];
18+
ssize_t lbTB[FB_MAXDIMENSIONS] = {0};
19+
ssize_t ubTB[FB_MAXDIMENSIONS] = {0};
2020

2121
/* fixed length? */
2222

0 commit comments

Comments
 (0)