From b424b78d3e33bf8438a364920c5a2987aa0cacb8 Mon Sep 17 00:00:00 2001
From: Raymond Toy <toy.raymond@gmail.com>
Date: Mon, 4 Aug 2014 18:59:06 -0700
Subject: [PATCH] Remove -mtune=generic from Config.x86_common.

Netbsd apparently doesn't like this, so we're moving that option to
the linux and darwin config files.

Reported by Robert Swindells.
---
 src/lisp/Config.x86_common | 2 +-
 src/lisp/Config.x86_darwin | 2 +-
 src/lisp/Config.x86_linux  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/lisp/Config.x86_common b/src/lisp/Config.x86_common
index ad2b1a092..1873f7d01 100644
--- a/src/lisp/Config.x86_common
+++ b/src/lisp/Config.x86_common
@@ -54,7 +54,7 @@ CPP_INCLUDE_OPTIONS := -I. -I$(PATH1) -I-
 endif
 
 CPPFLAGS := $(CPP_DEFINE_OPTIONS) $(CPP_INCLUDE_OPTIONS) 
-CFLAGS += -Wstrict-prototypes -Wall -O2 -g -mtune=generic
+CFLAGS += -Wstrict-prototypes -Wall -O2 -g
 ASFLAGS = -g 
 
 ASSEM_SRC = x86-assem.S
diff --git a/src/lisp/Config.x86_darwin b/src/lisp/Config.x86_darwin
index 39c09bdea..7de9ef2fa 100644
--- a/src/lisp/Config.x86_darwin
+++ b/src/lisp/Config.x86_darwin
@@ -6,7 +6,7 @@ include Config.x86_common
 MIN_VER = -mmacosx-version-min=10.5
 
 CPPFLAGS += -DDARWIN $(MIN_VER) -m32
-CFLAGS += -g3
+CFLAGS += -g3 -mtune=generic
 ASFLAGS += -g3 $(MIN_VER)
 
 
diff --git a/src/lisp/Config.x86_linux b/src/lisp/Config.x86_linux
index cba5ec666..f43ac5362 100644
--- a/src/lisp/Config.x86_linux
+++ b/src/lisp/Config.x86_linux
@@ -1,7 +1,8 @@
 # -*- Mode: makefile -*-
 include Config.x86_common
 
-CPPFLAGS += -m32 -rdynamic -D__NO_CTYPE -D_GNU_SOURCE -march=pentium4 -mfpmath=sse
+CPPFLAGS += -D__NO_CTYPE -D_GNU_SOURCE
+CFLAGS += -m32 -rdynamic  -march=pentium4 -mfpmath=sse -mtune=generic
 
 UNDEFSYMPATTERN = -Xlinker -u -Xlinker &
 ASSEM_SRC +=  linux-stubs.S
-- 
GitLab