Skip to content

GitLab

E
efivar
Commit a1c14aca authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed gcc9 patch

parent 886f8d10
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
efivar-37-gcc9_fix.patch
View file @ a1c14aca
diff -uNr efivar-37/src/dp.h efivar-37-gcc9_fix/src/dp.h diff -uNr efivar-37/src/dp.h efivar-37-gcc9_fix/src/dp.h
--- efivar-37/src/dp.h 2018-12-06 02:47:42.000000000 +1030 --- efivar-37/src/dp.h 2018-12-06 02:47:42.000000000 +1030
+++ efivar-37-gcc9_fix/src/dp.h 2019-09-13 13:28:14.062649345 +0930 +++ efivar-37-gcc9_fix/src/dp.h 2019-09-17 16:05:39.967328497 +0930
@@ -70,7 +70,10 @@ @@ -70,8 +70,11 @@
#define format_guid(buf, size, off, dp_type, guid) ({ \ #define format_guid(buf, size, off, dp_type, guid) ({ \
int _rc; \ int _rc; \
char *_guidstr = NULL; \ char *_guidstr = NULL; \
+ efi_guid_t _guid; \ + efi_guid_t _guid; \
+ const efi_guid_t * const _guid_p = &_guid; \ + const efi_guid_t * const _guid_p = &_guid; \
\ \
- _rc = efi_guid_to_str(guid, &_guidstr); \
+ memmove(&_guid, guid, sizeof(_guid)); \ + memmove(&_guid, guid, sizeof(_guid)); \
_rc = efi_guid_to_str(guid, &_guidstr); \ + _rc = efi_guid_to_str(_guid_p, &_guidstr); \
if (_rc < 0) { \ if (_rc < 0) { \
efi_error("could not build %s GUID DP string", \ efi_error("could not build %s GUID DP string", \
dp_type); \
@@ -79,7 +82,7 @@ @@ -79,7 +82,7 @@
_guidstr = onstack(_guidstr, \ _guidstr = onstack(_guidstr, \
strlen(_guidstr)+1); \ strlen(_guidstr)+1); \
...@@ -23,7 +25,7 @@ diff -uNr efivar-37/src/dp.h efivar-37-gcc9_fix/src/dp.h ...@@ -23,7 +25,7 @@ diff -uNr efivar-37/src/dp.h efivar-37-gcc9_fix/src/dp.h
}) })
diff -uNr efivar-37/src/dp-message.c efivar-37-gcc9_fix/src/dp-message.c diff -uNr efivar-37/src/dp-message.c efivar-37-gcc9_fix/src/dp-message.c
--- efivar-37/src/dp-message.c 2018-12-06 02:47:42.000000000 +1030 --- efivar-37/src/dp-message.c 2018-12-06 02:47:42.000000000 +1030
+++ efivar-37-gcc9_fix/src/dp-message.c 2019-09-13 13:23:33.458170960 +0930 +++ efivar-37-gcc9_fix/src/dp-message.c 2019-09-17 15:57:44.341517290 +0930
@@ -620,11 +620,13 @@ @@ -620,11 +620,13 @@
) / sizeof(efi_ip_addr_t); ) / sizeof(efi_ip_addr_t);
format(buf, size, off, "Dns", "Dns("); format(buf, size, off, "Dns", "Dns(");
...@@ -42,7 +44,7 @@ diff -uNr efivar-37/src/dp-message.c efivar-37-gcc9_fix/src/dp-message.c ...@@ -42,7 +44,7 @@ diff -uNr efivar-37/src/dp-message.c efivar-37-gcc9_fix/src/dp-message.c
break; break;
diff -uNr efivar-37/src/guid.c efivar-37-gcc9_fix/src/guid.c diff -uNr efivar-37/src/guid.c efivar-37-gcc9_fix/src/guid.c
--- efivar-37/src/guid.c 2018-12-06 02:47:42.000000000 +1030 --- efivar-37/src/guid.c 2018-12-06 02:47:42.000000000 +1030
+++ efivar-37-gcc9_fix/src/guid.c 2019-09-13 13:29:54.746765852 +0930 +++ efivar-37-gcc9_fix/src/guid.c 2019-09-17 15:57:44.341517290 +0930
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
extern const efi_guid_t efi_guid_zero; extern const efi_guid_t efi_guid_zero;
...@@ -54,7 +56,7 @@ diff -uNr efivar-37/src/guid.c efivar-37-gcc9_fix/src/guid.c ...@@ -54,7 +56,7 @@ diff -uNr efivar-37/src/guid.c efivar-37-gcc9_fix/src/guid.c
} }
diff -uNr efivar-37/src/include/efivar/efivar.h efivar-37-gcc9_fix/src/include/efivar/efivar.h diff -uNr efivar-37/src/include/efivar/efivar.h efivar-37-gcc9_fix/src/include/efivar/efivar.h
--- efivar-37/src/include/efivar/efivar.h 2018-12-06 02:47:42.000000000 +1030 --- efivar-37/src/include/efivar/efivar.h 2018-12-06 02:47:42.000000000 +1030
+++ efivar-37-gcc9_fix/src/include/efivar/efivar.h 2019-09-13 13:31:06.306491220 +0930 +++ efivar-37-gcc9_fix/src/include/efivar/efivar.h 2019-09-17 15:57:44.342517292 +0930
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
extern int efi_guid_is_zero(const efi_guid_t *guid); extern int efi_guid_is_zero(const efi_guid_t *guid);
...@@ -66,7 +68,7 @@ diff -uNr efivar-37/src/include/efivar/efivar.h efivar-37-gcc9_fix/src/include/e ...@@ -66,7 +68,7 @@ diff -uNr efivar-37/src/include/efivar/efivar.h efivar-37-gcc9_fix/src/include/e
typedef struct efi_variable efi_variable_t; typedef struct efi_variable efi_variable_t;
diff -uNr efivar-37/src/ucs2.h efivar-37-gcc9_fix/src/ucs2.h diff -uNr efivar-37/src/ucs2.h efivar-37-gcc9_fix/src/ucs2.h
--- efivar-37/src/ucs2.h 2018-12-06 02:47:42.000000000 +1030 --- efivar-37/src/ucs2.h 2018-12-06 02:47:42.000000000 +1030
+++ efivar-37-gcc9_fix/src/ucs2.h 2019-09-13 13:37:59.004227023 +0930 +++ efivar-37-gcc9_fix/src/ucs2.h 2019-09-17 15:57:44.342517292 +0930
@@ -23,16 +23,21 @@ @@ -23,16 +23,21 @@
(((val) & ((mask) << (shift))) >> (shift)) (((val) & ((mask) << (shift))) >> (shift))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment