summaryrefslogtreecommitdiff
path: root/sysutils/memtest86+/files/patch-lib.c
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2021-02-17 01:36:14 +0000
committerKyle Evans <kevans@FreeBSD.org>2021-02-17 01:36:14 +0000
commit06c5005b2719735883d718c57261b9c9cc9b1597 (patch)
treedc7eaa5af2f3734d99e2e105f443d8ae9319c821 /sysutils/memtest86+/files/patch-lib.c
parentp5-Crypt-CBC is only used for test. (diff)
sysutils/memtest86+: remove dependency on gcc48
This is one of three ports still explicitly dependent on lang/gcc48. The problems that were preventing the upgrade were as follows: - The __OUT*/__IN* macros in io.h were declaring the produced functions as extern, yielding multiple "definitions." They're inline asm, so just give them static linkage. - reboot was declared inline with non-static linkage, thus leaving it in a weird state where it wasn't visible within the same CU or another CU. Drop the inline for now; if it really needs to be inlined, it can be moved into a header and declared `static inline`. I made these changes, then discovered there's a 5.31b that's still in testing. I checked the archive for that and was delighted to discover these changes had already actually been made there, too, so let's consider this a backport. PR: 253303 Approved by: avg (maintainer) MFH: 2021Q1
Notes
Notes: svn path=/head/; revision=565472
Diffstat (limited to 'sysutils/memtest86+/files/patch-lib.c')
-rw-r--r--sysutils/memtest86+/files/patch-lib.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/sysutils/memtest86+/files/patch-lib.c b/sysutils/memtest86+/files/patch-lib.c
new file mode 100644
index 000000000000..dde80182241a
--- /dev/null
+++ b/sysutils/memtest86+/files/patch-lib.c
@@ -0,0 +1,18 @@
+--- lib.c.orig 2021-02-06 17:28:48 UTC
++++ lib.c
+@@ -33,7 +33,7 @@ struct ascii_map_str {
+ int keycode;
+ };
+
+-inline void reboot(void)
++void reboot(void)
+ {
+
+ /* tell the BIOS to do a cold start */
+@@ -1196,4 +1196,4 @@ void get_list(int x, int y, int len, char *buf)
+ return;
+ }
+ }
+-}
+\ No newline at end of file
++}