-
-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c9aeea5
commit cd2792a
Showing
1 changed file
with
77 additions
and
0 deletions.
There are no files selected for viewing
77 changes: 77 additions & 0 deletions
77
patches/openssl/0002-Add-configuration-file-for-Managarm-targets.-Initial.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,77 @@ | ||
From 978ab880c1f82a43e10f7d941ef6f3ba36348b7e Mon Sep 17 00:00:00 2001 | ||
From: Dennis Bonke <[email protected]> | ||
Date: Tue, 1 Jun 2021 22:03:10 +0200 | ||
Subject: [PATCH 2/2] Add configuration file for Managarm targets. Initial work | ||
done by Qookie | ||
|
||
Signed-off-by: Dennis Bonke <[email protected]> | ||
--- | ||
Configurations/10-main.conf | 52 +++++++++++++++++++++++++++++++++++++ | ||
1 file changed, 52 insertions(+) | ||
|
||
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf | ||
index 2fcb96a0..06578754 100644 | ||
--- a/Configurations/10-main.conf | ||
+++ b/Configurations/10-main.conf | ||
@@ -918,6 +918,58 @@ my %targets = ( | ||
ranlib => "true", | ||
}, | ||
|
||
+#### Managarm | ||
+ "managarm-generic" => { | ||
+ inherit_from => [ "BASE_unix" ], | ||
+ CFLAGS => picker(default => "-Wall", | ||
+ debug => "-O0 -g", | ||
+ release => "-O3"), | ||
+ CXXFLAGS => picker(default => "-Wall", | ||
+ debug => "-O0 -g", | ||
+ release => "-O3"), | ||
+ cxxflags => add("-std=c++11"), | ||
+ lib_cppflags => combine("-DOPENSSL_USE_NODELETE", "-DL_ENDIAN"), | ||
+ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", | ||
+ 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)", | ||
+ }, | ||
+ | ||
+ # This breaks the usual configuration naming convention but it's more | ||
+ # convenient for us, since it matches the target triples | ||
+ | ||
+ "x86_64-managarm" => { | ||
+ inherit_from => [ "managarm-generic", asm("x86_64_asm") ], | ||
+ perlasm_scheme => "elf", | ||
+ | ||
+ # Configure doesn't want to play nice and passes "--cross-compile-suffix" | ||
+ # on to the GCC invocation | ||
+ CC => "x86_64-managarm-gcc", | ||
+ CXX => "x86_64-managarm-g++", | ||
+ | ||
+ }, | ||
+ "aarch64-managarm" => { | ||
+ inherit_from => [ "managarm-generic" ], | ||
+ perlasm_scheme => "linux64", | ||
+ | ||
+ # Configure doesn't want to play nice and passes "--cross-compile-suffix" | ||
+ # on to the GCC invocation | ||
+ CC => "aarch64-managarm-gcc", | ||
+ CXX => "aarch64-managarm-g++", | ||
+ }, | ||
+ "riscv64-managarm" => { | ||
+ inherit_from => [ "managarm-generic" ], | ||
+ perlasm_scheme => "linux64", | ||
+ | ||
+ # Configure doesn't want to play nice and passes "--cross-compile-suffix" | ||
+ # on to the GCC invocation | ||
+ CC => "riscv64-managarm-gcc", | ||
+ CXX => "riscv64-managarm-g++", | ||
+ }, | ||
+ | ||
#### *BSD | ||
"BSD-generic32" => { | ||
# As for thread cflag. Idea is to maintain "collective" set of | ||
-- | ||
2.45.2 | ||
|