mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
85 lines
3.1 KiB
Diff
85 lines
3.1 KiB
Diff
diff -ruwN source/apps/lib/apps.c source-new/apps/lib/apps.c
|
|
--- source/apps/lib/apps.c 2026-09-29 14:05:00.000000000 +0000
|
|
+++ source-new/apps/lib/apps.c 2026-11-02 13:12:01.017080874 +0000
|
|
@@ -2863,7 +2863,7 @@
|
|
return ret;
|
|
}
|
|
|
|
-#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
|
|
+#elif defined(_SC_CLK_TCK) && !defined(__RELIBC__) /* by means of unistd.h */
|
|
#include <sys/times.h>
|
|
|
|
double app_tminterval(int stop, int usertime)
|
|
diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.conf
|
|
--- source/Configurations/10-main.conf 2026-09-29 14:05:00.000000000 +0000
|
|
+++ source-new/Configurations/10-main.conf 2026-11-02 13:09:11.387128346 +0000
|
|
@@ -209,6 +209,40 @@
|
|
shared_extension => ".so",
|
|
},
|
|
|
|
+### Redox configurations
|
|
+ "redox-common" => {
|
|
+ inherit_from => [ "BASE_unix" ],
|
|
+ cc => "gcc",
|
|
+ thread_scheme => "pthreads",
|
|
+ dso_scheme => "dlfcn",
|
|
+ shared_target => "linux-shared",
|
|
+ shared_cflag => "-fPIC",
|
|
+ shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
|
|
+ shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
|
|
+ },
|
|
+ "redox-generic64" => {
|
|
+ inherit_from => [ "redox-common" ],
|
|
+ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
|
|
+ },
|
|
+ "redox-aarch64" => {
|
|
+ inherit_from => [ "redox-generic64" ],
|
|
+ perlasm_scheme => "linux64",
|
|
+ },
|
|
+ "redox-i586" => {
|
|
+ inherit_from => [ "redox-common" ],
|
|
+ bn_ops => "BN_LLONG",
|
|
+ perlasm_scheme => "elf",
|
|
+ },
|
|
+ "redox-riscv64gc" => {
|
|
+ inherit_from => [ "redox-generic64" ],
|
|
+ perlasm_scheme => "linux64",
|
|
+ },
|
|
+ "redox-x86_64" => {
|
|
+ inherit_from => [ "redox-generic64" ],
|
|
+ perlasm_scheme => "elf",
|
|
+ },
|
|
+
|
|
+
|
|
#### Solaris configurations
|
|
"solaris-common" => {
|
|
inherit_from => [ "BASE_unix" ],
|
|
@@ -694,7 +728,6 @@
|
|
shared_target => "linux-shared",
|
|
shared_cflag => "-fPIC",
|
|
shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
|
|
- enable => [ "afalgeng" ],
|
|
},
|
|
"linux-latomic" => {
|
|
inherit_from => [ "linux-generic32" ],
|
|
@@ -891,7 +924,6 @@
|
|
bn_ops => "SIXTY_FOUR_BIT_LONG",
|
|
asm_arch => 'x86_64',
|
|
perlasm_scheme => "elf",
|
|
- multilib => "64",
|
|
},
|
|
"linux-x86_64-clang" => {
|
|
inherit_from => [ "linux-x86_64" ],
|
|
diff -ruwN source/include/crypto/rand.h source-new/include/crypto/rand.h
|
|
--- source/include/crypto/rand.h 2026-09-29 14:05:00.000000000 +0000
|
|
+++ source-new/include/crypto/rand.h 2026-11-02 13:10:37.658190042 +0000
|
|
@@ -40,7 +40,7 @@
|
|
* default, we will try to read at least one of these files
|
|
*/
|
|
#define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom"
|
|
-#if defined(__linux) && !defined(__ANDROID__)
|
|
+#if defined(__linux) && !defined(__ANDROID__) && !defined(__RELIBC__) /* needs sys/shm.h */
|
|
#ifndef DEVRANDOM_WAIT
|
|
#define DEVRANDOM_WAIT "/dev/random"
|
|
#endif
|