Skip to content

Commit 7e12eab

Browse files
committed
Merge remote-tracking branch 'origin/fbc-1.10' into master
Conflicts: - changelog.txt, resolved by using 1.10.2 and 1.10.3 sections from fbc-1.10 - contrib/release/build.sh, resolved by portions of fbc-1.10 - inc/win/sdkddkver.bi, resolved by keeping 1.20.0 version
2 parents 6a1ceb8 + fa712ed commit 7e12eab

File tree

4 files changed

+164
-65
lines changed

4 files changed

+164
-65
lines changed

changelog.txt

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,30 +100,34 @@ Version 1.10.3
100100
[changed]
101101
- updated bindings: Windows API - refresh the existing windows headers after retranslating with addition of version 8.1 (&h0603) and windows 10 (&h0A00)
102102
- updated bindings: add machine translated versions of inc/win/excpt.bi and inc/win/sdkddkver.bi
103+
- 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
103104

104105
[added]
106+
- makefile: add bootstrap-dist-target to make only a single bootstrap-source-{fbtarget} package to allow variations on the bootstrap requirements for different systems
105107

106108
[fixed]
107109
- github #33: Bi include error in ntdef.bi
108110
- bad code generation of operator cast() UDT ptr passed to byval UDT ptr parameter when matching constructors() are also present
111+
- 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)
109112

110113

111114
Version 1.10.2
112115

113116
[changed]
114117

115118
[added]
116-
fbc: add FB_CPUTYPE_ARMV6_FP for -march=armv6+fp
117-
fbc: add FB_CPUTYPE_ARMV7A_FP for -march=armv7-a+fp
118-
makefile: pass BOOTFBCFLAGS to bootstrap-dist target when making source boostrap
119-
makefile: add FBSHA1 to BOOTFBCFLAGS to allow setting fbc's sha-1 version in the bootstrap sources
120-
makefile: DEFAULT_CPUTYPE_X86 build option to set the default X86 cpu; if given sets BUILD_FB_DEFAULT_CPUTYPE_X86 compiler configration option
121-
makefile: add BUILD_FB_DEFAULT_CPUTYPE_X86 to BOOTFBCFLAGS
122-
fbc: BUILD_FB_DEFAULT_CPUTYPE_X86 to set FB_DEFAULT_CPUTYPE_X86 in source code; if not given then default depends on host
123-
makefile: DEFAULT_CPUTYPE_ARM build option to set the default ARM cpu; if given sets BUILD_FB_DEFAULT_CPUTYPE_ARM compiler configration option
124-
makefile: add BUILD_FB_DEFAULT_CPUTYPE_ARM to BOOTFBCFLAGS
125-
fbc: BUILD_FB_DEFAULT_CPUTYPE_ARM to set FB_DEFAULT_CPUTYPE_ARM in source code; if not given then default is FB_CPUTYPE_ARMV7A
126-
makefile: add bootstrap-dist-arm to make ARM/AARCH64 only bootstrap-source-arm package (convenience for different build requirements and not building every source bootstrap target)
119+
- fbc: add FB_CPUTYPE_ARMV6_FP for -march=armv6+fp
120+
- fbc: add FB_CPUTYPE_ARMV7A_FP for -march=armv7-a+fp
121+
- makefile: pass BOOTFBCFLAGS to bootstrap-dist target when making source boostrap
122+
- makefile: add FBSHA1 to BOOTFBCFLAGS to allow setting fbc's sha-1 version in the bootstrap sources
123+
- makefile: DEFAULT_CPUTYPE_X86 build option to set the default X86 cpu; if given sets BUILD_FB_DEFAULT_CPUTYPE_X86 compiler configration option
124+
- makefile: add BUILD_FB_DEFAULT_CPUTYPE_X86 to BOOTFBCFLAGS
125+
- fbc: BUILD_FB_DEFAULT_CPUTYPE_X86 to set FB_DEFAULT_CPUTYPE_X86 in source code; if not given then default depends on host
126+
- makefile: DEFAULT_CPUTYPE_ARM build option to set the default ARM cpu; if given sets BUILD_FB_DEFAULT_CPUTYPE_ARM compiler configration option
127+
- makefile: add BUILD_FB_DEFAULT_CPUTYPE_ARM to BOOTFBCFLAGS
128+
- fbc: BUILD_FB_DEFAULT_CPUTYPE_ARM to set FB_DEFAULT_CPUTYPE_ARM in source code; if not given then default is FB_CPUTYPE_ARMV7A
129+
- makefile: add bootstrap-dist-arm to make ARM/AARCH64 only bootstrap-source-arm package (convenience for different build requirements and not building every source bootstrap target)
130+
- makefile: option FBPACKTARGET=name to set an alternate package name for releases without affecting the default behaviours of FBTARGET
127131

128132
[fixed]
129133
- updated bindings: BASS to 2.4.17.0

0 commit comments

Comments
 (0)