Merge commit '8a245d5c1800627af4cefa99162a89c7a46d8842'

Update grub-extras to fix build failure with GCC 9.

11 files changed, 46 insertions, 25 deletions

diff --git a/debian/grub-extras/915resolution/.bzrignore b/debian/grub-extras/915resolution/.bzrignore
deleted file mode 100644
index 9419894ae..000000000
--- a/debian/grub-extras/915resolution/.bzrignore
+++ /dev/null
@@ -1,3 +0,0 @@
-**/.deps-core
-**/.dirstamp
-Makefile.core.am
diff --git a/debian/grub-extras/915resolution/.gitignore b/debian/grub-extras/915resolution/.gitignore
new file mode 100644
index 000000000..56219d403
--- /dev/null
+++ b/debian/grub-extras/915resolution/.gitignore
@@ -0,0 +1,3 @@
+.deps-core
+.dirstamp
+/Makefile.core.am
diff --git a/debian/grub-extras/915resolution/915resolution.c b/debian/grub-extras/915resolution/915resolution.c
index 9a73d5fb1..0091a6695 100644
--- a/debian/grub-extras/915resolution/915resolution.c
+++ b/debian/grub-extras/915resolution/915resolution.c
@@ -758,13 +758,23 @@ static void set_mode(vbios_map * map, cardinal mode, cardinal x, cardinal y, car
                         vbios_modeline_type2 * modeline = &res->modelines[j];
                         
                         if (modeline->x1 == xprev && modeline->y1 == yprev) {
+                            unsigned long clock;
+                            word hsyncstart, hsyncend, hblank;
+                            word vsyncstart, vsyncend, vblank;
+
                             modeline->x1 = modeline->x2 = x-1;
                             modeline->y1 = modeline->y2 = y-1;
 
-                            gtf_timings(x, y, freqs[j], &modeline->clock,
-                                    &modeline->hsyncstart, &modeline->hsyncend,
-                                    &modeline->hblank, &modeline->vsyncstart,
-                                    &modeline->vsyncend, &modeline->vblank);
+                            gtf_timings(x, y, freqs[j], &clock,
+                                    &hsyncstart, &hsyncend, &hblank,
+                                    &vsyncstart, &vsyncend, &vblank);
+                            modeline->clock = clock;
+                            modeline->hsyncstart = hsyncstart;
+                            modeline->hsyncend = hsyncend;
+                            modeline->hblank = hblank;
+                            modeline->vsyncstart = vsyncstart;
+                            modeline->vsyncend = vsyncend;
+                            modeline->vblank = vblank;
 
                             if (htotal)
                                 modeline->htotal = htotal;
@@ -790,13 +800,24 @@ static void set_mode(vbios_map * map, cardinal mode, cardinal x, cardinal y, car
                         vbios_modeline_type3 * modeline = &res->modelines[j];
                         
                         if (modeline->x1 == xprev && modeline->y1 == yprev) {
+                            unsigned long clock;
+                            word hsyncstart, hsyncend, hblank;
+                            word vsyncstart, vsyncend, vblank;
+
                             modeline->x1 = modeline->x2 = x-1;
                             modeline->y1 = modeline->y2 = y-1;
                             
-                            gtf_timings(x, y, freqs[j], &modeline->clock,
-                                    &modeline->hsyncstart, &modeline->hsyncend,
-                                    &modeline->hblank, &modeline->vsyncstart,
-                                    &modeline->vsyncend, &modeline->vblank);
+                            gtf_timings(x, y, freqs[j], &clock,
+                                    &hsyncstart, &hsyncend, &hblank,
+                                    &vsyncstart, &vsyncend, &vblank);
+                            modeline->clock = clock;
+                            modeline->hsyncstart = hsyncstart;
+                            modeline->hsyncend = hsyncend;
+                            modeline->hblank = hblank;
+                            modeline->vsyncstart = vsyncstart;
+                            modeline->vsyncend = vsyncend;
+                            modeline->vblank = vblank;
+
                             if (htotal)
                                 modeline->htotal = htotal;
                             else
diff --git a/debian/grub-extras/disabled/gpxe/.bzrignore b/debian/grub-extras/disabled/gpxe/.bzrignore
deleted file mode 100644
index 9419894ae..000000000
--- a/debian/grub-extras/disabled/gpxe/.bzrignore
+++ /dev/null
@@ -1,3 +0,0 @@
-**/.deps-core
-**/.dirstamp
-Makefile.core.am
diff --git a/debian/grub-extras/disabled/gpxe/.gitignore b/debian/grub-extras/disabled/gpxe/.gitignore
new file mode 100644
index 000000000..56219d403
--- /dev/null
+++ b/debian/grub-extras/disabled/gpxe/.gitignore
@@ -0,0 +1,3 @@
+.deps-core
+.dirstamp
+/Makefile.core.am
diff --git a/debian/grub-extras/disabled/zfs/.bzrignore b/debian/grub-extras/disabled/zfs/.bzrignore
deleted file mode 100644
index f1d6c22e3..000000000
--- a/debian/grub-extras/disabled/zfs/.bzrignore
+++ /dev/null
@@ -1,5 +0,0 @@
-**/.deps-core
-**/.deps-util
-**/.dirstamp
-Makefile.core.am
-Makefile.util.am
diff --git a/debian/grub-extras/disabled/zfs/.gitignore b/debian/grub-extras/disabled/zfs/.gitignore
new file mode 100644
index 000000000..6931cccf6
--- /dev/null
+++ b/debian/grub-extras/disabled/zfs/.gitignore
@@ -0,0 +1,5 @@
+.deps-core
+.deps-util
+.dirstamp
+/Makefile.core.am
+/Makefile.util.am
diff --git a/debian/grub-extras/lua/.bzrignore b/debian/grub-extras/lua/.bzrignore
deleted file mode 100644
index 9419894ae..000000000
--- a/debian/grub-extras/lua/.bzrignore
+++ /dev/null
@@ -1,3 +0,0 @@
-**/.deps-core
-**/.dirstamp
-Makefile.core.am
diff --git a/debian/grub-extras/lua/.gitignore b/debian/grub-extras/lua/.gitignore
new file mode 100644
index 000000000..56219d403
--- /dev/null
+++ b/debian/grub-extras/lua/.gitignore
@@ -0,0 +1,3 @@
+.deps-core
+.dirstamp
+/Makefile.core.am
diff --git a/debian/grub-extras/ntldr-img/.bzrignore b/debian/grub-extras/ntldr-img/.bzrignore
deleted file mode 100644
index 9419894ae..000000000
--- a/debian/grub-extras/ntldr-img/.bzrignore
+++ /dev/null
@@ -1,3 +0,0 @@
-**/.deps-core
-**/.dirstamp
-Makefile.core.am
diff --git a/debian/grub-extras/ntldr-img/.gitignore b/debian/grub-extras/ntldr-img/.gitignore
new file mode 100644
index 000000000..56219d403
--- /dev/null
+++ b/debian/grub-extras/ntldr-img/.gitignore
@@ -0,0 +1,3 @@
+.deps-core
+.dirstamp
+/Makefile.core.am