X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=759091ee11f4adc11b72bde8aeaa26d6d2c94365;hb=c48b83513ad53097baaf937ad278db32b3d362d8;hp=66a645f3202fa93518757b21ed1da9f368f26c4e;hpb=5d2f4e30ccbd3b0b5433a86c7a1fba7559ffa428;p=lilypond.git

diff --git a/lily/main.cc b/lily/main.cc
index 66a645f320..759091ee11 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -172,7 +172,8 @@ char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION;
    unpredictable places. To get around this, we tell the x87 FPU to use only
    double precision. Note that this is not needed for x86_64 because that uses
    the SSE unit by default instead of the x87 FPU. */
-#ifdef __x86__
+#if ((defined(__x86__) || defined(__i386__)) \
+  && defined(HAVE_FPU_CONTROL_H) && (HAVE_FPU_CONTROL_H == 1))
 
 #include <fpu_control.h>
 static void configure_fpu() {
@@ -185,7 +186,7 @@ static void configure_fpu() {
 static void configure_fpu() {
 }
 
-#endif /* __x86__ */
+#endif /* defined(__x86__) || defined(__i386__) */
 
 
 static void
@@ -239,9 +240,10 @@ static void
 notice ()
 {
   identify (stdout);
-  puts (_f (NOTICE, PROGRAM_NAME).c_str ());
   printf ("\n");
   copyright ();
+  printf ("\n");
+  puts (_f (NOTICE, PROGRAM_NAME).c_str ());
 }
 
 LY_DEFINE (ly_usage, "ly:usage",
@@ -556,7 +558,6 @@ parse_argv (int argc, char **argv)
 
   if (show_help)
     {
-      identify (stdout);
       ly_usage ();
       if (be_verbose_global)
 	dir_info (stdout);