-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade Fiwix to 1.5.0-lb1, pulling from upstream Mikaku repo.
- Loading branch information
1 parent
133c054
commit cfeaee6
Showing
15 changed files
with
108 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#undef NR_PROCS | ||
#define NR_PROCS 4096 | ||
#undef NR_CALLOUTS | ||
#define NR_CALLOUTS NR_PROCS | ||
#undef NR_OPENS | ||
#define NR_OPENS 1536 | ||
#undef NR_FLOCKS | ||
#define NR_FLOCKS (NR_PROCS * 5) | ||
#undef MAX_PID_VALUE | ||
#define MAX_PID_VALUE 16000000 | ||
#undef RAMDISK_DRIVES | ||
#define RAMDISK_DRIVES 0 | ||
#define CONFIG_SYSCALL_6TH_ARG | ||
#define CONFIG_VM_SPLIT22 | ||
#define CONFIG_KEXEC | ||
#undef CONFIG_OFFSET64 | ||
#define CONFIG_MMAP2 | ||
#define CONFIG_MADVISE_STUB | ||
#define CONFIG_64BIT_SYSCALLS | ||
#undef CONFIG_NET | ||
#define CONFIG_STUB_EXIT_GROUP | ||
#undef CONFIG_PRINTK64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#undef INIT_PROGRAM | ||
#define INIT_PROGRAM "/init" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#undef CHILD_MAX | ||
#define CHILD_MAX 4096 | ||
#undef OPEN_MAX | ||
#define OPEN_MAX 1536 | ||
#undef FD_SETSIZE | ||
#define FD_SETSIZE OPEN_MAX |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#undef UTS_SYSNAME | ||
#define UTS_SYSNAME "Linux" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
5aee0b059f5dddb096779b9fb7d6f5f47b56da750623a0a506f47632d31efac6 /boot/fiwix |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
https://github.com/mikaku/Fiwix/releases/download/v1.5.0-lb1/fiwix-1.5.0-lb1.tar.gz 6635f8b8a44694a374daccd528a8d22550e684d33dc967f7fa2d161b9d69deb4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
steps/musl-1.1.24/patches-pass3/madvise_preserve_errno.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# SPDX-FileCopyrightText: 2023 Richard Masters <[email protected]> | ||
# SPDX-License-Identifier: MIT | ||
diff -r -u musl-1.1.24.orig/src/malloc/malloc.c musl-1.1.24/src/malloc/malloc.c | ||
--- src/malloc/malloc.c 2019-10-13 21:58:27.000000000 +0000 | ||
+++ src/malloc/malloc.c 2023-12-22 23:18:21.088570834 +0000 | ||
@@ -496,7 +496,9 @@ | ||
uintptr_t a = (uintptr_t)self + SIZE_ALIGN+PAGE_SIZE-1 & -PAGE_SIZE; | ||
uintptr_t b = (uintptr_t)next - SIZE_ALIGN & -PAGE_SIZE; | ||
#if 1 | ||
+ int e = errno; | ||
__madvise((void *)a, b-a, MADV_DONTNEED); | ||
+ errno = e; | ||
#else | ||
__mmap((void *)a, b-a, PROT_READ|PROT_WRITE, | ||
MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# SPDX-FileCopyrightText: 2023 Richard Masters <[email protected]> | ||
# SPDX-License-Identifier: MIT | ||
diff -r -u musl-1.1.24.orig/src/malloc/malloc.c musl-1.1.24/src/malloc/malloc.c | ||
--- src/malloc/malloc.c 2019-10-13 21:58:27.000000000 +0000 | ||
+++ src/malloc/malloc.c 2023-12-22 23:18:21.088570834 +0000 | ||
@@ -496,7 +496,9 @@ | ||
uintptr_t a = (uintptr_t)self + SIZE_ALIGN+PAGE_SIZE-1 & -PAGE_SIZE; | ||
uintptr_t b = (uintptr_t)next - SIZE_ALIGN & -PAGE_SIZE; | ||
#if 1 | ||
+ int e = errno; | ||
__madvise((void *)a, b-a, MADV_DONTNEED); | ||
+ errno = e; | ||
#else | ||
__mmap((void *)a, b-a, PROT_READ|PROT_WRITE, | ||
MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
ph->p_paddr = ph->p_vaddr; | ||
if (ph->p_paddr >= 0xC0000000) | ||
ph->p_paddr = ph->p_paddr - 0xC0000000; | ||
if (s1->text_addr == 0x80100000) | ||
ph->p_paddr = ph->p_paddr - 0x80000000; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
f81f0cb4d77be9b724f6afcca966811fb347010b21aee6eb39dc2caf9f287e07 /usr/bin/tcc | ||
cff99e8badc080f57f34b31560d266b703b79c5ed8380a9ddfc3f1694aba10bd /usr/bin/tcc |