-
Notifications
You must be signed in to change notification settings - Fork 1
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
Showing
6 changed files
with
147 additions
and
59 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 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,32 @@ | ||
| From 4e35f3b7621f6ff22f1f2b76d4a95ff32fc401b3 Mon Sep 17 00:00:00 2001 | ||
| From: Kartatz <[email protected]> | ||
| Date: Fri, 17 May 2024 16:43:54 +0200 | ||
| Subject: [PATCH] Add libversions | ||
|
|
||
| This is dynamically generated by the Makefile in OpenBSD ports, but since we are not using it, let's define those values manually | ||
| --- | ||
| libversions | 12 ++++++++++++ | ||
| 1 file changed, 12 insertions(+) | ||
| create mode 100644 libversions | ||
|
|
||
| diff --git a/libversions b/libversions | ||
| new file mode 100644 | ||
| index 0000000..f3e875d | ||
| --- /dev/null | ||
| +++ b/libversions | ||
| @@ -0,0 +1,12 @@ | ||
| +LIBestdc++_LTVERSION = -version-info 20:0 | ||
| +LIBgfortran_LTVERSION = -version-info 9:0 | ||
| +LIBobjc_LTVERSION = -version-info 9:0 | ||
| +LIBlto_plugin_LTVERSION = -version-info 6:0 | ||
| +LIBitm_LTVERSION = -version-info 5:0 | ||
| +LIBatomic_LTVERSION = -version-info 4:0 | ||
| +LIBquadmath_LTVERSION = -version-info 4:0 | ||
| +LIBcc1_LTVERSION = -version-info 2:0 | ||
| +LIBcc1plugin_LTVERSION = -version-info 2:0 | ||
| +LIBcp1plugin_LTVERSION = -version-info 1:0 | ||
| +LIBgphobos_LTVERSION = -version-info 0:0 | ||
| +LIBgdruntime_LTVERSION = -version-info 0:0 | ||
| -- | ||
| 2.36.6 | ||
|
|
24 changes: 24 additions & 0 deletions
24
patches/0001-Fix-libatomic-build-with-newer-GCC-versions.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,24 @@ | ||
| From 294e57ba5a44bd5c9553033aa61b5f00613b25d9 Mon Sep 17 00:00:00 2001 | ||
| From: Kartatz <[email protected]> | ||
| Date: Fri, 17 May 2024 16:57:52 +0200 | ||
| Subject: [PATCH] Fix libatomic build with newer GCC versions | ||
|
|
||
| This is required due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87231 | ||
| --- | ||
| gcc/config/t-openbsd | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/gcc/config/t-openbsd b/gcc/config/t-openbsd | ||
| index 3b625d6..3123d34 100644 | ||
| --- a/gcc/config/t-openbsd | ||
| +++ b/gcc/config/t-openbsd | ||
| @@ -1,5 +1,5 @@ | ||
| # We don't need GCC's own include files. | ||
| -USER_H = $(EXTRA_HEADERS) | ||
| +# USER_H = $(EXTRA_HEADERS) | ||
|
|
||
| # OpenBSD-specific D support. | ||
| openbsd-d.o: $(srcdir)/config/openbsd-d.cc | ||
| -- | ||
| 2.36.6 | ||
|
|
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,70 @@ | ||
| From 9676b6bc275b9914db045d9258790c788aa4c7b1 Mon Sep 17 00:00:00 2001 | ||
| From: Kartatz <[email protected]> | ||
| Date: Fri, 17 May 2024 16:35:36 +0200 | ||
| Subject: [PATCH] That's not OpenBSD | ||
|
|
||
| --- | ||
| gcc/targhooks.c | 4 ++-- | ||
| libgcc/config/t-hardfp | 6 +++--- | ||
| libiberty/cp-demangle.c | 2 +- | ||
| 3 files changed, 6 insertions(+), 6 deletions(-) | ||
|
|
||
| diff --git a/gcc/targhooks.c b/gcc/targhooks.c | ||
| index 947b88e..6ce2036 100644 | ||
| --- a/gcc/targhooks.c | ||
| +++ b/gcc/targhooks.c | ||
| @@ -900,9 +900,9 @@ default_external_stack_protect_fail (void) | ||
|
|
||
| name = (char *)xmalloc(32); | ||
| if (NULL == (tmp_name = fname_as_string (0))) { | ||
| - strlcpy (name, "*unknown*", 32); | ||
| + strcpy (name, "*unknown*"); | ||
| } else { | ||
| - strlcpy (name, tmp_name, 32); | ||
| + strcpy (name, tmp_name); | ||
| } | ||
|
|
||
| length = strlen (name); | ||
| diff --git a/libgcc/config/t-hardfp b/libgcc/config/t-hardfp | ||
| index 2df7088..85140be 100644 | ||
| --- a/libgcc/config/t-hardfp | ||
| +++ b/libgcc/config/t-hardfp | ||
| @@ -60,11 +60,11 @@ hardfp_func_list += $(foreach pair, $(hardfp_truncations), \ | ||
| hardfp_func_list := $(filter-out $(hardfp_exclusions),$(hardfp_func_list)) | ||
|
|
||
| # Regexp for matching a floating-point mode. | ||
| -hardfp_mode_regexp := $(shell echo $(hardfp_float_modes) | gsed 's/ /\\|/g') | ||
| +hardfp_mode_regexp := $(shell echo $(hardfp_float_modes) | sed 's/ /\\|/g') | ||
|
|
||
| # Regexp for matching the end of a function name, after the last | ||
| # floating-point mode. | ||
| -hardfp_suffix_regexp := $(shell echo $(hardfp_int_modes) 2 3 | gsed 's/ /\\|/g') | ||
| +hardfp_suffix_regexp := $(shell echo $(hardfp_int_modes) 2 3 | sed 's/ /\\|/g') | ||
|
|
||
| # Add -D options to define: | ||
| # FUNC: the function name (e.g. __addsf3) | ||
| @@ -73,7 +73,7 @@ hardfp_suffix_regexp := $(shell echo $(hardfp_int_modes) 2 3 | gsed 's/ /\\|/g') | ||
| # TYPE: the last floating-point mode (e.g. sf) | ||
| hardfp_defines_for = \ | ||
| $(shell echo $1 | \ | ||
| - gsed 's/\(.*\)\($(hardfp_mode_regexp)\)\($(hardfp_suffix_regexp)\|\)$$/-DFUNC=__& -DOP_\1\3 -DTYPE=\2/') | ||
| + sed 's/\(.*\)\($(hardfp_mode_regexp)\)\($(hardfp_suffix_regexp)\|\)$$/-DFUNC=__& -DOP_\1\3 -DTYPE=\2/') | ||
|
|
||
| hardfp-o = $(patsubst %,%$(objext),$(hardfp_func_list)) | ||
| $(hardfp-o): %$(objext): $(srcdir)/config/hardfp.c | ||
| diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c | ||
| index e21e7b5..2f7e3a3 100644 | ||
| --- a/libiberty/cp-demangle.c | ||
| +++ b/libiberty/cp-demangle.c | ||
| @@ -6619,7 +6619,7 @@ __cxa_demangle (const char *mangled_name, char *output_buffer, | ||
| { | ||
| if (strlen (demangled) < *length) | ||
| { | ||
| - strlcpy (output_buffer, demangled, *length); | ||
| + strcpy (output_buffer, demangled); | ||
| free (demangled); | ||
| demangled = output_buffer; | ||
| } | ||
| -- | ||
| 2.36.6 | ||
|
|
This file was deleted.
Oops, something went wrong.