From 96ca7ee67a36605a33de8d57eb8e8d3998bc6427 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Wed, 03 Sep 2014 14:30:21 -0400
Subject: Merge libreboot-6b6.

Conflicts:
	buildrom-withgrub
---
(limited to 'resources/grubinvaders')

diff --git a/resources/grubinvaders/patch/compile.sh.patch b/resources/grubinvaders/patch/compile.sh.patch
new file mode 100644
index 0000000..0e7c3b8
--- /dev/null
+++ b/resources/grubinvaders/patch/compile.sh.patch
@@ -0,0 +1,4 @@
+6c6
+< CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
+---
+> CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror -fno-stack-protector"
diff --git a/resources/grubinvaders/patch/diff.patch b/resources/grubinvaders/patch/diff.patch
new file mode 100644
index 0000000..2867dea
--- /dev/null
+++ b/resources/grubinvaders/patch/diff.patch
@@ -0,0 +1,45 @@
+diff -ur invaders/clean.sh invaders-fixed/clean.sh
+--- invaders/clean.sh	2001-05-21 22:43:13.000000000 +0200
++++ invaders-fixed/clean.sh	2009-04-13 17:03:14.000000000 +0200
+@@ -2,4 +2,4 @@
+ 
+ set -e
+ set -v
+-rm -f *.o *~ invaders.exec
++rm -f *.o *~ invaders.exec invaders
+diff -ur invaders/compile.sh invaders-fixed/compile.sh
+--- invaders/compile.sh	2001-05-21 22:26:46.000000000 +0200
++++ invaders-fixed/compile.sh	2009-04-13 16:59:44.000000000 +0200
+@@ -4,7 +4,7 @@
+ set -v
+ 
+ CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
+-LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
++LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none"
+ gcc $CFLAGS -c keyboard.c
+ gcc $CFLAGS -c delay.c
+ gcc $CFLAGS -c common.c
+diff -ur invaders/video.c invaders-fixed/video.c
+--- invaders/video.c	2001-05-13 15:56:33.000000000 +0200
++++ invaders-fixed/video.c	2009-04-13 17:01:22.000000000 +0200
+@@ -36,7 +36,7 @@
+   video_putchar(x+1,y,hextab[hex&15]);
+ };
+ 
+-void video_putstring(int32 x, int32 y, uint8 *str)
++void video_putstring(int32 x, int32 y, char *str)
+ {
+   while (*str) video_putchar(x++,y,*(str++));
+ };
+diff -ur invaders/video.h invaders-fixed/video.h
+--- invaders/video.h	2001-05-13 15:56:33.000000000 +0200
++++ invaders-fixed/video.h	2009-04-13 17:01:05.000000000 +0200
+@@ -8,7 +8,7 @@
+ void video_putchar(int32 x, int32 y, uint8 code);
+ void video_fill(int32 x, int32 y, int32 width, int32 height, uint8 code);
+ void video_puthex8(int32 x, int32 y, uint8 hex);
+-void video_putstring(int32 x, int32 y, uint8 *str);
++void video_putstring(int32 x, int32 y, char *str);
+ 
+ // immediate effect
+ void video_update();
--
cgit v0.9.1