Tweak settings for SuperH setup, based on Debian bug 594159. Since as

far as I know this is the first and only real use, or even test, of
botan on the SH, I'll let them pick the names and flags...

3 files changed, 9 insertions, 8 deletions

diff --git a/src/build-data/arch/hitachi-sh.txt b/src/build-data/arch/hitachi-sh.txt
deleted file mode 100644
index bab84b48f..000000000
--- a/src/build-data/arch/hitachi-sh.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<submodels>
-hitachi-sh1
-hitachi-sh2
-hitachi-sh3
-hitachi-sh3e
-hitachi-sh4
-</submodels>
diff --git a/src/build-data/arch/superh.txt b/src/build-data/arch/superh.txt
new file mode 100644
index 000000000..c7dc09861
--- /dev/null
+++ b/src/build-data/arch/superh.txt
@@ -0,0 +1,5 @@
+<submodels>
+sh2
+sh3
+sh4
+</submodels>
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index fde33cde2..f82b9d36f 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -42,6 +42,9 @@ solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
 i386           -> "-mtune=i686 -momit-leaf-frame-pointer"
 ppc601         -> "-mpowerpc -mcpu=601"
 
+# The patch from Debian bug 594159 has this, don't know why though...
+sh4            -> "-m4 -mieee"
+
 # Until GCC gets -march support for these models
 nehalem        -> "-march=core2 -msse4.1 -msse4.2"
 westmere       -> "-march=core2 -maes -msse4.1 -msse4.2"
@@ -55,7 +58,7 @@ alpha-ev7      -> "-mcpu=ev6"
 # before it's put into SUBMODEL.
 alpha     -> "-mcpu=SUBMODEL" alpha-
 arm       -> "-march=SUBMODEL"
-hitachi-sh -> "-mSUBMODEL" hitachi-sh
+superh    -> "-mSUBMODEL" sh
 hppa      -> "-march=SUBMODEL" hppa
 ia64      -> "-mtune=SUBMODEL"
 m68k      -> "-mSUBMODEL"