diff --git a/aports/main/openiboot/APKBUILD b/aports/main/openiboot/APKBUILD index 9c58e789..e3379d1c 100644 --- a/aports/main/openiboot/APKBUILD +++ b/aports/main/openiboot/APKBUILD @@ -14,6 +14,8 @@ source=" gnu-inline.patch disable-thumb.patch disable-werror.patch + gcc-inline2.patch + gcc-stdlib.patch " options="!check" @@ -32,4 +34,6 @@ package() { sha512sums="dbd35f0dc158757c174f68f15fe779397aadc6b238e0385ebd85ea16bec361fdb7b89dc124555da56a158c8b8fb7468c2536d7ccd89f8cb619b86ab3b957211e openiboot.tar.gz 799f930aa33d54c061a5c84ed60205a4d2f6a65caa0e80288694c626154faf6e09b1688c4e93996af5b1ac52bb1ef2b1e4269b738a4aac52bcf17f9643b9be81 gnu-inline.patch 061cf38d6ef841e5657ff9536aab0bc714617bfee4a4ce08d108b838ad6304160d1581c311332d281a506308eccfb9a75dc1886ea819d4345db017d14b365453 disable-thumb.patch -4d7ab7e6a5336de044f1811a6de0e33d45b71bbf00616ca9767f7c753b657d8fe9761aebc05619b03eaab9f42bb60439c2d163b81900c1e7fee69cae027bb33d disable-werror.patch" +4d7ab7e6a5336de044f1811a6de0e33d45b71bbf00616ca9767f7c753b657d8fe9761aebc05619b03eaab9f42bb60439c2d163b81900c1e7fee69cae027bb33d disable-werror.patch +6cdb1745f33b7d20afb7205dacedfbdf4111fcde5e6d6f1b7e30495f72405f248be8a9d1361c7f4e513461254521857004e94db7e50ca2e30e25e33748087633 gcc-inline2.patch +7a25e4ee10744041d1f96467f9a6e141998c821ad4a5a569866632148597d0fd020f4536849be559b0078b980bd14e41fce2534a521a23bc9e068589a4c5f29f gcc-stdlib.patch" diff --git a/aports/main/openiboot/gcc-inline2.patch b/aports/main/openiboot/gcc-inline2.patch new file mode 100644 index 00000000..be9cf918 --- /dev/null +++ b/aports/main/openiboot/gcc-inline2.patch @@ -0,0 +1,13 @@ +diff --git a/util.c b/util.c +index 2f5ea3c..36e28bc 100644 +--- a/util.c ++++ b/util.c +@@ -856,7 +856,7 @@ uint32_t next_power_of_two(uint32_t n) { + return val; + } + +-inline void auto_store(void *_ptr, size_t _sz, uint32_t _val) ++__attribute__ ((gnu_inline)) inline void auto_store(void *_ptr, size_t _sz, uint32_t _val) + { + switch(_sz) + { diff --git a/aports/main/openiboot/gcc-stdlib.patch b/aports/main/openiboot/gcc-stdlib.patch new file mode 100644 index 00000000..99ba5a59 --- /dev/null +++ b/aports/main/openiboot/gcc-stdlib.patch @@ -0,0 +1,13 @@ +diff --git a/scons/ARMEnvironment.SConscript b/scons/ARMEnvironment.SConscript +index f79b733..79c92ea 100644 +--- a/scons/ARMEnvironment.SConscript ++++ b/scons/ARMEnvironment.SConscript +@@ -10,7 +10,7 @@ def ARMEnvironment(*a, **kw): + env.Append(CPPPATH = ['#includes']) + env.Append(CPPFLAGS = plat_flags+['-nostdlib']) + env.Append(ASPPFLAGS = ['-xassembler-with-cpp']) +- env.Append(LINKFLAGS = plat_flags+['-nostdlib', '--nostdlib', '-Ttext=0x0']) ++ env.Append(LINKFLAGS = plat_flags+['-nostdlib', '-Ttext=0x0']) + env.Append(LIBS = ['gcc']) + + env['PROGSUFFIX'] = ''