diff -Nru fpc-3.2.2+dfsg/debian/changelog fpc-3.2.2+dfsg/debian/changelog --- fpc-3.2.2+dfsg/debian/changelog 2022-08-20 12:31:18.000000000 +0000 +++ fpc-3.2.2+dfsg/debian/changelog 2022-08-28 03:48:25.000000000 +0000 @@ -1,3 +1,14 @@ +fpc (3.2.2+dfsg-15+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 2.6.4+dfsg-4+rpi1 by Peter Michael Green at Mon, 20 Oct 2014 23:12:17 +0000] + * Set compiler defaults for raspbian. + + [changes brought forward from 3.2.2+dfsg-4+rpi2 by Peter Michael Green at Sun, 20 Feb 2022 19:45:37 +0000] + * Apply hack to work around binutils bug https://sourceware.org/bugzilla/show_bug.cgi?id=28848 + * Fix clean target. + + -- Raspbian forward porter Sun, 28 Aug 2022 03:48:25 +0000 + fpc (3.2.2+dfsg-15) unstable; urgency=medium * Team upload diff -Nru fpc-3.2.2+dfsg/debian/patches/force-abi-tags-in-cprt0.patch fpc-3.2.2+dfsg/debian/patches/force-abi-tags-in-cprt0.patch --- fpc-3.2.2+dfsg/debian/patches/force-abi-tags-in-cprt0.patch 1970-01-01 00:00:00.000000000 +0000 +++ fpc-3.2.2+dfsg/debian/patches/force-abi-tags-in-cprt0.patch 2022-08-28 03:48:25.000000000 +0000 @@ -0,0 +1,14 @@ +Set ABI tags in cprt0.as to work around binutils fussiness + +This should not be pushed upstream or to Debian as it will almost certainly +break things on soft float targets. + +--- fpc-3.2.2+dfsg/fpcsrc/rtl/linux/arm/cprt0.as 2013-06-27 14:01:18.000000000 +0000 ++++ fpc-3.2.2+dfsg/fpcsrc/rtl/linux/arm/cprt0.as 2022-02-20 19:18:21.442456415 +0000 +@@ -146,3 +146,6 @@ + 3: .align 4 + + .section .note.GNU-stack,"",%progbits ++ ++.eabi_attribute 28, 1 @Tag_ABI_VFP_args ++.eabi_attribute 10, 2 @Tag_FP_arch diff -Nru fpc-3.2.2+dfsg/debian/patches/raspbian.diff fpc-3.2.2+dfsg/debian/patches/raspbian.diff --- fpc-3.2.2+dfsg/debian/patches/raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ fpc-3.2.2+dfsg/debian/patches/raspbian.diff 2022-08-28 03:48:25.000000000 +0000 @@ -0,0 +1,34 @@ +Description: Change compiler defaults for raspbian + We need armv6 and vfpv2 rather than armv7 and vfpv3-d16 +Author: Peter Michael Green + +--- fpc-3.2.0+dfsg.orig/fpcsrc/compiler/options.pas ++++ fpc-3.2.0+dfsg/fpcsrc/compiler/options.pas +@@ -4067,25 +4067,15 @@ begin + end; + end; + ++ + { ARMHF defaults } + if (target_info.abi = abi_eabihf) then +- { set default cpu type to ARMv7a for ARMHF unless specified otherwise } ++ { set default cpu type to ARMv6 for ARMHF unless specified otherwise } + begin +- {$ifdef CPUARMV6} +- { if the compiler is built for armv6, then +- inherit this setting, e.g. Raspian is armhf but +- only armv6, this makes rebuilds of the compiler +- easier } + if not option.CPUSetExplicitly then + init_settings.cputype:=cpu_armv6; + if not option.OptCPUSetExplicitly then + init_settings.optimizecputype:=cpu_armv6; +- {$else CPUARMV6} +- if not option.CPUSetExplicitly then +- init_settings.cputype:=cpu_armv7a; +- if not option.OptCPUSetExplicitly then +- init_settings.optimizecputype:=cpu_armv7a; +- {$endif CPUARMV6} + + { Set FPU type } + if not(option.FPUSetExplicitly) then diff -Nru fpc-3.2.2+dfsg/debian/patches/series fpc-3.2.2+dfsg/debian/patches/series --- fpc-3.2.2+dfsg/debian/patches/series 2022-08-16 09:17:42.000000000 +0000 +++ fpc-3.2.2+dfsg/debian/patches/series 2022-08-28 03:48:25.000000000 +0000 @@ -32,3 +32,5 @@ glibc2.34.patch ppc64el-toc-fixes.patch pas2jni-cthreads.patch +raspbian.diff +force-abi-tags-in-cprt0.patch diff -Nru fpc-3.2.2+dfsg/debian/rules fpc-3.2.2+dfsg/debian/rules --- fpc-3.2.2+dfsg/debian/rules 2022-06-05 07:11:33.000000000 +0000 +++ fpc-3.2.2+dfsg/debian/rules 2022-08-28 03:48:25.000000000 +0000 @@ -242,6 +242,9 @@ rm -f $(DEB_BUILD_FPC_OPT) rm -f $(DEB_HOST_FPC_OPT) + #cleanup a file that got left behind by a failed build + rm -f fpcdocs/link*.res + dh_clean FPCMAKEFILES=fpcsrc/Makefile.fpc $(shell find demo fpcdocs -name Makefile.fpc) diff -Nru fpc-3.2.2+dfsg/debian/source/timestamps fpc-3.2.2+dfsg/debian/source/timestamps --- fpc-3.2.2+dfsg/debian/source/timestamps 2022-08-12 20:30:58.000000000 +0000 +++ fpc-3.2.2+dfsg/debian/source/timestamps 2022-08-28 03:48:25.000000000 +0000 @@ -5,8 +5,17 @@ fpcsrc/compiler/globals.pas 2020-05-14T13:54+00:00 fpcsrc/compiler/hlcgobj.pas 2020-05-14T13:54+00:00 fpcsrc/compiler/m68k/cpubase.pas 2022-05-26T16:24+00:00 +fpcsrc/compiler/ncgvmt.pas 2022-08-28T04:05+00:00 +fpcsrc/compiler/options.pas 2022-08-28T04:05+00:00 +fpcsrc/compiler/powerpc64/cgcpu.pas 2022-08-28T04:05+00:00 fpcsrc/compiler/powerpc64/cpupara.pas 2022-05-26T16:24+00:00 +fpcsrc/compiler/ppcgen/cgppc.pas 2022-08-28T04:05+00:00 +fpcsrc/compiler/ppcgen/hlcgppc.pas 2022-08-28T04:05+00:00 +fpcsrc/compiler/psub.pas 2022-08-28T04:05+00:00 +fpcsrc/compiler/symconst.pas 2022-08-28T04:05+00:00 +fpcsrc/compiler/systems.pas 2022-08-28T04:05+00:00 fpcsrc/compiler/systems/t_linux.pas 2020-05-14T13:54+00:00 +fpcsrc/compiler/utils/ppuutils/ppudump.pp 2022-08-28T04:05+00:00 fpcsrc/compiler/version.pas 2020-05-14T13:54+00:00 fpcsrc/compiler/x86/cgx86.pas 2020-05-14T13:54+00:00 fpcsrc/compiler/x86/cpubase.pas 2022-05-26T16:24+00:00 @@ -44,6 +53,9 @@ fpcsrc/packages/ncurses/src/ncurses.pp 2020-05-14T13:54+00:00 fpcsrc/rtl/inc/ufloat128.pp 2022-05-26T16:24+00:00 fpcsrc/rtl/inc/ufloatx80.pp 2022-05-26T16:24+00:00 +fpcsrc/rtl/linux/i386/si_c21.inc 2022-08-28T04:05+00:00 +fpcsrc/rtl/linux/powerpc64/si_c.inc 2022-08-28T04:05+00:00 +fpcsrc/rtl/linux/powerpc64/si_g.inc 2022-08-28T04:05+00:00 fpcsrc/rtl/linux/x86_64/si_c.inc 2021-06-13T15:32+00:00 fpcsrc/rtl/unix/dl.pp 2020-05-14T13:54+00:00 fpcsrc/tests/utils/testsuite/utests.pp 2020-08-19T00:44+00:00 @@ -62,4 +74,5 @@ fpcsrc/utils/instantfpc/fpmake.pp 2020-05-14T13:54+00:00 fpcsrc/utils/instantfpc/ifpc.pas 2020-05-14T13:54+00:00 fpcsrc/utils/instantfpc/instantfpc.pas 2020-05-14T13:54+00:00 +fpcsrc/utils/pas2jni/pas2jni.pas 2022-08-28T04:05+00:00 fpcsrc/utils/relpath.pas 2020-05-14T13:54+00:00