Skip to content
Snippets Groups Projects
New look: Off

Adjust to GCC8 upgrade in Alpine edge

    • Closed Imported Issue created by Administrator @root

    This week (probably today), Alpine is going to upgrade their GCC from version 6 to 8 in Alpine edge. pmOS is based on Alpine edge, hence we need to adjust our aports as well.

    I expect breakage in the kernels for example, as older kernels explicitly check for the GCC version and then include a file based on what it found. Newer kernels only include one file if the compiler is GCC, independent of the version.

    Here's an issue, so we can note down the progress of the upgrade.

    Edited
    To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information

    Child items ...

    • Activity

    • Administrator mentioned in merge request !4 (merged) · Imported

      mentioned in merge request !4 (merged)

      By Oliver Smith on 2018-09-26T06:43:31

    • Administrator
      Administrator @root · Imported
      Author Owner

      GCC has been upgraded for all arches now. I'm not entirely sure if we have to rebuild all our packages that required GCC to build, does anyone know? I assume most stuff will compile fine (I know for a fact Phosh and it's dependencies did) except most of the kernels.

      By Bart Ribbers on 2018-09-26T19:25:09

      Edited by Administrator
    • Administrator
      Administrator @root · Imported
      Author Owner

      I've started the branch feature/gcc8 today which currently contains regenerated gcc and binutils aports and a commit that renamed the compiler-gcc6.h file to compiler-gcc8.h in the FP2 kernel and adjusts the devicepkg-dev package to that filename. Sadly the kernel does not compile due to very helpful errors

      /tmp/ccCNJBpc.s: Assembler messages:
/tmp/ccCNJBpc.s:678: Error: .err encountered
/tmp/ccCNJBpc.s:728: Error: .err encountered
/tmp/ccCNJBpc.s:1101: Error: .err encountered
/tmp/ccCNJBpc.s:8200: Error: .err encountered

      By Luca Weiss on 2018-09-26T22:15:19

    • Administrator
      Administrator @root · Imported
      Author Owner

      GCC has been upgraded for all arches now. I'm not entirely sure if we have to rebuild all our packages that required GCC to build, does anyone know?

      I think it would be better to to that now than finding out that the packages don't compile with GCC8 as soon as we are trying to update them.

      I'll be online later today (in 8-9 hours) to work on that.

      @z3ntu: does the patch from here fix this? https://lkml.org/lkml/2018/7/26/187

      (In general, if it's not much extra effort, it would be nice if we could turn compiler-gcc*.h into a regular .patch file now that we need to touch it everywhere anyway.)

      By Oliver Smith on 2018-09-27T07:21:03

    • Administrator
      Administrator @root · Imported
      Author Owner

      Update: The patch (adjusted) fixes the compilation but the kernel doesn't boot and I even with earlyprintk I didn't see any output out of the serial connection so I'm saying "it doesn't work".

      By Luca Weiss on 2018-09-27T12:22:34

    • Administrator
      Administrator @root · Imported
      Author Owner

      Maybe this has something to do with it:

      [2402860] booting linux @ 0x8000, ramdisk @ 0x1000000 (1278235), tags/device tree @ 0x100
[2402870] undefined abort, halting
[2402870] r0  0x00000000 r1  0x00000000 r2  0x00000100 r3  0x00008000
[2402870] r4  0x11000000 r5  0x00000100 r6  0x00008000 r7  0x00000000
[2402870] r8  0x0073a800 r9  0x0f99dd00 r10 0x0f9297cc r11 0x00000004
[2402870] r12 0x60000193 usp 0x00000000 ulr 0x00000000 pc  0x00008000
[2402870] spsr 0x20000193

      Thing is, it actually just appears when doing fastboot boot and not when booting the flashed kernel.

      By Luca Weiss on 2018-09-27T12:27:52

    • Administrator mentioned in commit 8cd9e694 · Imported

      mentioned in commit 8cd9e694

      By Oliver Smith on 2018-09-27T17:19:42

    • Administrator
      Administrator @root · Imported
      Author Owner

      After throughout research, I can't find any patch or even any mention of the error message you've posted.

      It would be nice if we could all kernels work with GCC8 in theory. But when it starts with something like that, it doesn't seem feasible, and it doesn't really seem worth wasting a lot of time on this.

      So I'm going the route of keeping gcc6 around, exclusively for the legacy vendor kernels.

      TODO:

      • create main/gcc6 based on Alpine's latest gcc6 aport
      • (only package gcc there, not g++? gcc would be enough for the kernels)
      • make sure it does not conflict with gcc8
        • use a different install prefix
        • symlink to /usr/bin/gcc6
      • create cross compiler gcc6 aports (adjust pmbootstrap aportgen code for that)
        • make sure they don't conflict: apk add gcc gcc6 gcc-armhf gcc6-armhf should work
      • adjust cross compiler code to detect gcc6 packages (use CC=gcc6 in the APKBUILDs?) and to use the appropriate cross compiler for them instead of the gcc8 one
      • make sure all 3.x kernels compile with the new gcc6 packaging
      • adjust default aportgen template for linux-*
      • see the todo list below

      nice to have:

      • test case: gcc6 packages must have the same version
      • test case: linux aports that depend on gcc6 should have the same HOSTCC=... lines (see below)

      By Oliver Smith on 2018-10-05T07:29:48

      Edited by Administrator
    • Administrator
      Administrator @root · Imported
      Author Owner

      I just noticed that Linux 3.16 is still being maintained over at kernel.org. Maybe a relevant patch can be found here; however I did not find one as I looked through the results. So unless somebody is able to fix the error @z3ntu reported, we'll need to go with the GCC6 aport solution.

      By Oliver Smith on 2018-09-27T21:02:25

      Edited by Administrator
    • Administrator
      Administrator @root · Imported
      Author Owner

      I tried the downstream kernel (3.1) for samsung-p4wifi and it boots postmarketOS. I had to apply the two patches below.

      https://github.com/Decatf/android_kernel_samsung_p4/commit/8c8187d41b99acd4f2078d0fff6807e0eeb47407
      https://github.com/Decatf/android_kernel_samsung_p4/commit/a7bfe0a2832e66f3d732e4210b5d53c81cc7a85f

      I don't have serial for this device so I don't know if it even had the boot loader issues mentioned above

      I haven't used this downstream kernel a long time since there is a mainline(-ish) kernel for this device. I used this kernel for Android and had it compiling on GCC 5.x (iirc) before I stopped using it. There's more GCC related patches in the commit history but I don't remember all the details. The branch is here:
      https://github.com/Decatf/android_kernel_samsung_p4/tree/aosp-ng-gcc8

      Only other patch I can remember is this
      https://github.com/Decatf/android_kernel_samsung_p4/commit/bd0772df2132bf56cda78e7204facf434cd5aa40

      Which was a really messy merge of this:
      https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cb984d101b30eb7478d32df56a0023e4603cba7f

      By ryang on 2018-09-28T01:11:33

      Edited by Administrator
    • Administrator
      Administrator @root · Imported
      Author Owner

      Thank you very much @ryang2678!

      bd0772df2132bf56cda78e7204facf434cd5aa40 sounds like a good solution to getting rid of the compiler-N.h files. But it is unlikely that this would resolve the boot problem, right?

      By Oliver Smith on 2018-09-28T05:33:01

    • Administrator mentioned in commit f667bebe · Imported

      mentioned in commit f667bebe

      By Oliver Smith on 2018-09-28T06:16:52

    • Administrator mentioned in commit eae15aec · Imported

      mentioned in commit eae15aec

      By Oliver Smith on 2018-09-28T06:24:12

    • Administrator mentioned in merge request !24 (merged) · Imported

      mentioned in merge request !24 (merged)

      By Oliver Smith on 2018-09-28T06:24:44

    • Administrator mentioned in commit b53afb3a · Imported

      mentioned in commit b53afb3a

      By Oliver Smith on 2018-09-28T06:26:01

    • Administrator
      Administrator @root · Imported
      Author Owner

      I'm making good progress with adding support for GCC6, see the checkboxes above. The pmbootstrap aportgen gcc6-armhf etc. code lives in the feature/aportgen-gcc6 branch right now, and the changes necessary were rather simple. It's still WIP though, the resulting gcc6-armhf package is conflicting with gcc6 right now:

      ERROR: gcc6-armhf-6.4.0-r0: trying to overwrite usr/bin/gcc6 owned by gcc6-6.4.0-r0.
ERROR: gcc6-armhf-6.4.0-r0: trying to overwrite usr/gcc6/lib/libcc1.so owned by gcc6-6.4.0-r0.
ERROR: gcc6-armhf-6.4.0-r0: trying to overwrite usr/gcc6/lib/libcc1.so.0 owned by gcc6-6.4.0-r0.
ERROR: gcc6-armhf-6.4.0-r0: trying to overwrite usr/gcc6/lib/libcc1.so.0.0.0 owned by gcc6-6.4.0-r0.
ERROR: gcc6-armhf-6.4.0-r0: trying to overwrite usr/gcc6/bin/gcc6 owned by gcc6-6.4.0-r0.
ERROR: gcc6-armhf-6.4.0-r0: trying to overwrite usr/gcc6/bin/cc owned by gcc6-6.4.0-r0.

      I'll continue working on this as soon as I find time for it. If somebody else wants to play with this in the meantime, take a look at the TODOs and go ahead!

      By Oliver Smith on 2018-09-28T07:17:56

    • Administrator
      Administrator @root · Imported
      Author Owner

      Little status update, MRs coming as soon as this works.

      • Cross compilers can be generated now, they compile and they don't conflict.
      • gcc6 doesn't get installed to usr/bin/gcc6 anymore. Instead, all gcc6 programs get symlinked to /usr/bin/gcc6-... - that way they don't conflict with anything.
      • I've added gcc6 to the builddepends, and check for that in the Python code of pmbootstrap. When that is the case, it installs the gcc6 cross compiler.
      • So all in all it's pretty close to working as PoC. I need to fine tune the Linux APKBUILD now, so it really uses the cross compiler, and maybe a few other fixes.

      Looks like this could be ready on monday.

      By Oliver Smith on 2018-09-29T20:45:22

    • Administrator mentioned in commit pmbootstrap@3e7c95e8 · Imported

      mentioned in commit pmbootstrap@3e7c95e8

      By Oliver Smith on 2018-09-30T02:31:29

    • Administrator mentioned in merge request pmbootstrap!1699 (merged) · Imported

      mentioned in merge request pmbootstrap!1699 (merged)

      By Oliver Smith on 2018-09-30T02:33:10

    • Administrator mentioned in commit 27f31bcc · Imported

      mentioned in commit 27f31bcc

      By Oliver Smith on 2018-09-30T02:40:45

    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    • Loading
    Please register or sign in to reply