[patch] patch to fix name clash with gcc feature

nescc-1.1.3-noinline.patch (text/plain), 2.12 KB, created by Johannes Ballé on 2005-01-21 00:13:46 UTC

diff -ruN nesc-1.1.3.orig/src/attributes.c nesc-1.1.3/src/attributes.c
--- nesc-1.1.3.orig/src/attributes.c	2004-11-22 19:54:39.000000000 +0100
+++ nesc-1.1.3/src/attributes.c	2005-01-20 09:41:31.000000000 +0100
@@ -105,7 +105,7 @@
     }
   else if (!strcmp(name, "noinline"))
     {
-      ddecl->noinline = TRUE;
+      ddecl->noinlinep = TRUE;
     }
   else if (!(target->decl_attribute &&
 	     target->decl_attribute(attr, ddecl)) &&
diff -ruN nesc-1.1.3.orig/src/decls.h nesc-1.1.3/src/decls.h
--- nesc-1.1.3.orig/src/decls.h	2004-11-22 19:29:59.000000000 +0100
+++ nesc-1.1.3/src/decls.h	2005-01-20 09:41:46.000000000 +0100
@@ -140,7 +140,7 @@
          function_event, function_command }
     ftype;
   bool isinline;
-  bool noinline;
+  bool noinlinep;
   bool isexterninline;
   bool defined;			/* nesC: true if defined, false if used */
   bool suppress_definition;	/* Prevent code generation */
diff -ruN nesc-1.1.3.orig/src/nesc-inline.c nesc-1.1.3/src/nesc-inline.c
--- nesc-1.1.3.orig/src/nesc-inline.c	2004-07-28 19:02:04.000000000 +0200
+++ nesc-1.1.3/src/nesc-inline.c	2005-01-20 09:42:02.000000000 +0100
@@ -311,7 +311,7 @@
 {
   gedge call_edge, called_edge, next_edge;
 
-  if (in->uninlinable || in->fn->noinline) 
+  if (in->uninlinable || in->fn->noinlinep) 
     return;
 
   in->fn->makeinline = TRUE;
diff -ruN nesc-1.1.3.orig/src/semantics.c nesc-1.1.3/src/semantics.c
--- nesc-1.1.3.orig/src/semantics.c	2004-11-23 21:03:25.000000000 +0100
+++ nesc-1.1.3/src/semantics.c	2005-01-20 09:42:25.000000000 +0100
@@ -129,7 +129,7 @@
   dd->in_system_header = ast->location->in_system_header;
   dd->ftype = 0;
   dd->isinline = FALSE;
-  dd->noinline = FALSE;
+  dd->noinlinep = FALSE;
   dd->isexterninline = FALSE;
   dd->oldstyle_args = NULL;
   dd->vtype = 0;
@@ -1546,8 +1546,8 @@
 
   /* If either of the decls says noinline, make sure that none of the
      declerations are made inline. */
-  if (newdecl->noinline || olddecl->noinline) 
-    newdecl->noinline = olddecl->noinline = TRUE;
+  if (newdecl->noinlinep || olddecl->noinlinep) 
+    newdecl->noinlinep = olddecl->noinlinep = TRUE;
 
   if (different_binding_level)
     {