Exomizer: forgot to add patches.

This commit is contained in:
Adrien Destugues
2015-08-07 18:35:24 +02:00
parent 8b3e8bfadb
commit 80e7a9cd20

View File

@@ -0,0 +1,50 @@
From 85cd06b9f153fa8b77e82d20cd561f0ac9bbba4c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 25 Jul 2015 09:14:21 +0200
Subject: gcc2 fix.
diff --git a/Makefile b/Makefile
index 92fd825..2cc78d1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# Makefile for exomizer
#
WFLAGS = -Wall -Wstrict-prototypes
-CFLAGS = $(WFLAGS) -O3 -ffast-math -mtune=i686 -fomit-frame-pointer -fgcse -pedantic
+CFLAGS = $(WFLAGS) -O3 -ffast-math -march=i686 -fomit-frame-pointer -fgcse -pedantic
LDFLAGS = -s
#CFLAGS = -g -mtune=i686 $(WFLAGS)
--
2.2.2
From ca5c2fc883d1ea4e3ffc7443ffbb8264fd553f82 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 25 Jul 2015 09:44:28 +0200
Subject: Fix build with recent Bison versions
* This file uses ECHO as a token, which Bison used to generate as a #define.
* New versions of Bison will put the tokens in an enum instead.
* Lex defines an ECHO macro, and code in asm.yy ends up using that
instead of the enum value.
* The lex macro is guarded by an ifndef, so just define the macro to
skip the lex replacement.
diff --git a/asm.yy b/asm.yy
index 6220623..69f106f 100644
--- a/asm.yy
+++ b/asm.yy
@@ -34,6 +34,7 @@
#include "parse.h"
#include "asm.tab.h"
+#define ECHO ECHO
#define MAX_SRC_BUFFER_DEPTH 10
static YY_BUFFER_STATE src_buffers[MAX_SRC_BUFFER_DEPTH];
static int src_buffer_depth = 0;
--
2.2.2