[rtmk-discuss] gcc 3.3 patches for rtmk and rig

[Jeroen Dekkers]

Here are the 2 patches to make gcc 3.3 happy:

For rig:
2003-07-01  Jeroen Dekkers  <address@hidden>

        * gen-syms.awk: Generate code with no unescaped newlines 
        inside strings.
        * presc.c (presc_initial_comment_emit): Escape newlines in the string.

Index: gen-syms.awk
===================================================================
RCS file: /cvsroot/rtmk/rig/gen-syms.awk,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 gen-syms.awk
--- gen-syms.awk        27 Mar 2002 00:17:38 -0000      1.1.1.1
+++ gen-syms.awk        1 Jul 2003 14:04:14 -0000
@@ -30,7 +30,7 @@ BEGIN {
 }
 
 /^expr/ {
-       print "__asm(\"";
+       print "__asm(\"\\n\\";
        if($3 == "") 
                printf "* %s mAgIc%%0\" : : \"i\" (%s));\n", $2, $2;
        else
@@ -38,7 +38,7 @@ BEGIN {
 }
 
 /^offset/ {
-       print "__asm (\"";
+       print "__asm (\"\\n\\";
        if ($5 == "") {
                printf "* %s_%s mAgIc%%0\" : : \"i\" (&((struct 
%s*)0)->%s));\n",
                        toupper($3), toupper($4), $2, $4;
@@ -50,7 +50,7 @@ BEGIN {
 }
 
 /^sizeof/ {
-       print "__asm (\"";
+       print "__asm (\"\\n\\";
        if ($4 == "")
                printf "* %s_SIZE mAgIc%%0\" : : \"i\" (sizeof(%s)));\n",
                        toupper($3), $2;
Index: presc.c
===================================================================
RCS file: /cvsroot/rtmk/rig/presc.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 presc.c
--- presc.c     27 Mar 2002 00:17:38 -0000      1.1.1.1
+++ presc.c     1 Jul 2003 14:04:14 -0000
@@ -103,25 +103,25 @@ presc_type_emit (struct ptype *pt, int d
 void
 presc_initial_comment_emit (void)
 {
-  fprintf (dstfp, "/* This file was generated by RIG, the rtmk interface 
generator.
-
-   RIG is free software; you can redistribute it and/or modify it under 
-   the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   RIG is distributed in the hope that it will be useful, but 
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this RIG; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-
-   NOTE THAT THE PROGRAM THAT THIS FILE IS A PART OF DO NOT
-   HAVE TO BE UNDER THE GNU GENERAL PUBLIC LICENCE.  */
-
+  fprintf (dstfp, "/* This file was generated by RIG, the rtmk interface 
generator.\n\
+\n\
+   RIG is free software; you can redistribute it and/or modify it under\n\
+   the terms of the GNU General Public License as published by\n\
+   the Free Software Foundation; either version 2 of the License, or\n\
+   (at your option) any later version.\n\
+\n\
+   RIG is distributed in the hope that it will be useful, but\n\
+   WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
+   GNU General Public License for more details.\n\
+\n\
+   You should have received a copy of the GNU General Public License\n\
+   along with this RIG; if not, write to the Free Software\n\
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
USA.\n\
+\n\
+   NOTE THAT THE PROGRAM THAT THIS FILE IS A PART OF DO NOT\n\
+   HAVE TO BE UNDER THE GNU GENERAL PUBLIC LICENCE.  */\n\
+\n\
 ");
 
   /* The kernel requires GCC, so we do these defines.  */



For rtmk:
2003-07-01  Jeroen Dekkers  <address@hidden>

        * i386/generate-symbols: Generate code with no unescaped newlines 
        inside strings.

Index: i386/generate-symbols
===================================================================
RCS file: /cvsroot/rtmk/rtmk/i386/generate-symbols,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 generate-symbols
--- i386/generate-symbols       7 Dec 2001 02:06:21 -0000       1.1.1.1
+++ i386/generate-symbols       1 Jul 2003 14:18:24 -0000
@@ -34,7 +34,7 @@ BEGIN {
 }
 
 /^expr/ {
-       print "__asm(\"";
+       print "__asm(\"\\n\\";
        if($3 == "") 
                printf "* %s mAgIc%%0\" : : \"i\" (%s));\n", $2, $2;
        else
@@ -42,7 +42,7 @@ BEGIN {
 }
 
 /^offset/ {
-       print "__asm (\"";
+       print "__asm (\"\\n\\";
        if ($5 == "") {
                printf "* %s_%s mAgIc%%0\" : : \"i\" (&((struct 
%s*)0)->%s));\n",
                        toupper($3), toupper($4), $2, $4;
@@ -54,7 +54,7 @@ BEGIN {
 }
 
 /^sizeof/ {
-       print "__asm (\"";
+       print "__asm (\"\\n\\";
        if ($4 == "")
                printf "* %s_SIZE mAgIc%%0\" : : \"i\" (sizeof(struct %s)));\n",
                        toupper($3), $2;