diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2014-09-03 14:30:21 (EDT) |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2014-09-03 14:30:21 (EDT) |
| commit | 96ca7ee67a36605a33de8d57eb8e8d3998bc6427 (patch) | |
| tree | 07202c5fe7d366f50d9d17010f3bbf0a44c08ee8 /resources/grubinvaders/patch | |
| parent | 4e8051dfaa0ba5617961481056eb7e79d7b50861 (diff) | |
| parent | 9a321884379a71b5f0986fdfb97a2b6c5bdccd8a (diff) | |
| download | libreboot-r20140903.zip libreboot-r20140903.tar.gz libreboot-r20140903.tar.bz2 | |
Merge libreboot-6b6.r20140903
Conflicts:
buildrom-withgrub
Diffstat (limited to 'resources/grubinvaders/patch')
| -rw-r--r-- | resources/grubinvaders/patch/compile.sh.patch | 4 | ||||
| -rw-r--r-- | resources/grubinvaders/patch/diff.patch | 45 |
2 files changed, 49 insertions, 0 deletions
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(); |