diff -Nru fpc-3.0.4+dfsg/debian/changelog fpc-3.0.4+dfsg/debian/changelog --- fpc-3.0.4+dfsg/debian/changelog 2018-03-02 08:13:21.000000000 +0000 +++ fpc-3.0.4+dfsg/debian/changelog 2018-03-13 01:36:30.000000000 +0000 @@ -1,3 +1,10 @@ +fpc (3.0.4+dfsg-16+rpi1) buster-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. + + -- Raspbian forward porter Tue, 13 Mar 2018 01:36:30 +0000 + fpc (3.0.4+dfsg-16) unstable; urgency=medium * [tests] Update autopkgtest reference files diff -Nru fpc-3.0.4+dfsg/debian/patches/raspbian.diff fpc-3.0.4+dfsg/debian/patches/raspbian.diff --- fpc-3.0.4+dfsg/debian/patches/raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ fpc-3.0.4+dfsg/debian/patches/raspbian.diff 2018-03-13 01:36:29.000000000 +0000 @@ -0,0 +1,56 @@ +Description: Change compiler defaults for raspbian + We need armv6 and vfpv2 rather than armv7 and vfpv3-d16 +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: fpc-3.0.0+dfsg/fpcsrc/compiler/options.pas +=================================================================== +--- fpc-3.0.0+dfsg.orig/fpcsrc/compiler/options.pas ++++ fpc-3.0.0+dfsg/fpcsrc/compiler/options.pas +@@ -3692,7 +3692,8 @@ begin + begin + if not(option.FPUSetExplicitly) then + begin +- init_settings.fputype:=fpu_vfpv3_d16 ++ //RPI -- reduce default fpu to vfpv2 ++ init_settings.fputype:=fpu_vfpv2 + end + else + begin +@@ -3729,10 +3730,9 @@ begin + end; + end; + +-{ set default cpu type to ARMv7a for ARMHF unless specified otherwise } ++{ set default cpu type to ARMv6 for Raspbian unless specified otherwise } + if (target_info.abi = abi_eabihf) then + 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 +@@ -3741,12 +3741,6 @@ if (target_info.abi = abi_eabihf) 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} + end; + + if (init_settings.instructionset=is_thumb) and not(CPUARM_HAS_THUMB2 in cpu_capabilities[init_settings.cputype]) then diff -Nru fpc-3.0.4+dfsg/debian/patches/series fpc-3.0.4+dfsg/debian/patches/series --- fpc-3.0.4+dfsg/debian/patches/series 2018-01-26 08:45:07.000000000 +0000 +++ fpc-3.0.4+dfsg/debian/patches/series 2018-03-13 01:36:29.000000000 +0000 @@ -30,3 +30,4 @@ fix-units-path-to-be-multi-arch-safe.patch fix_make_files_generation.patch fix-IDE-GDB-support.patch +raspbian.diff diff -Nru fpc-3.0.4+dfsg/debian/source/timestamps fpc-3.0.4+dfsg/debian/source/timestamps --- fpc-3.0.4+dfsg/debian/source/timestamps 2017-10-28 20:16:25.000000000 +0000 +++ fpc-3.0.4+dfsg/debian/source/timestamps 2018-03-13 01:36:30.000000000 +0000 @@ -120,9 +120,29 @@ fpcsrc/compiler/x86/nx86mem.pas 2017-02-24T10:42+00:00 fpcsrc/compiler/x86_64/cgcpu.pas 2017-02-24T10:42+00:00 fpcsrc/compiler/x86_64/cpuelf.pas 2017-02-24T10:42+00:00 +fpcsrc/ide/fp.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/fpcompil.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/fpconst.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/fpdebug.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/fpdesk.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/fpide.pas 2018-03-13T01:50+00:00 fpcsrc/ide/fpini.pas 2017-02-24T10:42+00:00 fpcsrc/ide/fpmake.pp 2017-02-24T10:42+00:00 +fpcsrc/ide/fpmopts.inc 2018-03-13T01:50+00:00 +fpcsrc/ide/fpregs.pas 2018-03-13T01:50+00:00 fpcsrc/ide/fptemplt.pas 2017-02-24T10:42+00:00 +fpcsrc/ide/fpusrscr.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/fpvars.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/fpviews.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/gdbmicon.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/gdbmiint.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/gdbmiproc.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/gdbmiwrap.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/globdir.inc 2018-03-13T01:50+00:00 +fpcsrc/ide/weditor.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/windebug.pas 2018-03-13T01:50+00:00 +fpcsrc/ide/wresourc.pas 2018-03-13T01:50+00:00 +fpcsrc/packages/fcl-js/fpmake.pp 2018-03-13T01:50+00:00 fpcsrc/packages/fcl-res/src/elfconsts.pp 2017-02-24T10:42+00:00 fpcsrc/packages/fcl-res/src/elfdefaulttarget.inc 2017-02-24T10:42+00:00 fpcsrc/packages/fcl-res/src/elfreader.pp 2017-02-24T10:42+00:00 @@ -139,6 +159,7 @@ fpcsrc/packages/fpmkunit/src/fpmkunit.pp 2017-02-24T10:42+00:00 fpcsrc/packages/iosxlocale/fpmake.pp 2017-02-24T10:42+00:00 fpcsrc/packages/iosxlocale/src/iosxwstr.pp 2017-02-24T10:42+00:00 +fpcsrc/packages/ncurses/src/form.pp 2018-03-13T01:50+00:00 fpcsrc/packages/rtl-extra/src/linux/unixsock.inc 2017-02-24T10:42+00:00 fpcsrc/packages/rtl-extra/src/unix/ipc.pp 2017-02-24T10:42+00:00 fpcsrc/rtl/aarch64/aarch64.inc 2017-02-24T10:42+00:00 @@ -153,7 +174,6 @@ fpcsrc/rtl/arm/arm.inc 2017-02-24T10:42+00:00 fpcsrc/rtl/arm/thumb2.inc 2017-02-24T10:42+00:00 fpcsrc/rtl/bsd/ostypes.inc 2017-02-24T10:42+00:00 -fpcsrc/rtl/bsd/sysos.inc 2017-02-24T10:42+00:00 fpcsrc/rtl/darwin/aarch64/sig_cpu.inc 2017-02-24T10:42+00:00 fpcsrc/rtl/darwin/aarch64/sighnd.inc 2017-02-24T10:42+00:00 fpcsrc/rtl/darwin/extres_multiarch.inc 2017-02-24T10:42+00:00 @@ -185,10 +205,11 @@ fpcsrc/rtl/unix/cthreads.pp 2017-02-24T10:42+00:00 fpcsrc/rtl/unix/cwstring.pp 2017-02-24T10:42+00:00 fpcsrc/rtl/unix/dl.pp 2017-02-24T10:42+00:00 -fpcsrc/rtl/unix/initc.pp 2017-02-24T10:42+00:00 fpcsrc/rtl/unix/timezone.inc 2017-02-24T10:42+00:00 +fpcsrc/tests/test/units/sysutils/texpfncase.pp 2018-03-13T01:50+00:00 fpcsrc/utils/fpcm/fpcmmain.pp 2017-02-24T10:42+00:00 fpcsrc/utils/fpcm/fpcmwr.pp 2017-02-24T10:42+00:00 +fpcsrc/utils/fpcm/fpmake.pp 2018-03-13T01:50+00:00 fpcsrc/utils/fpcres/fpcres.pas 2017-02-24T10:42+00:00 fpcsrc/utils/fpcres/target.pas 2017-02-24T10:42+00:00 fpcsrc/utils/fpdoc/dglobals.pp 2017-02-24T10:42+00:00