2005-11-21 Joel Sherrill <joel.sherrill@oarcorp.com>

[pf3gnuchains/gcc-fork.git] / gcc / java / resource.c

diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index 6257d37..0f4cafa 100644 (file)
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -1,5 +1,5 @@
 /* Functions related to building resource files.
 /* Functions related to building resource files.

-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

    Free Software Foundation, Inc.
 
 This file is part of GCC.
    Free Software Foundation, Inc.
 
 This file is part of GCC.


@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to

-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.

 
 Java and all Java-based marks are trademarks or registered trademarks
 of Sun Microsystems, Inc. in the United States and other countries.
 
 Java and all Java-based marks are trademarks or registered trademarks
 of Sun Microsystems, Inc. in the United States and other countries.


@@ -42,6 +42,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "target.h"
 #include "expr.h"
 #include "tree-iterator.h"
 #include "target.h"
 #include "expr.h"
 #include "tree-iterator.h"

+#include "cgraph.h"

 
 /* DOS brain-damage */
 #ifndef O_BINARY
 
 /* DOS brain-damage */
 #ifndef O_BINARY


@@ -69,9 +70,9 @@ compile_resource_data (const char *name, const char *buffer, int length)
   FINISH_RECORD (rtype);
   START_RECORD_CONSTRUCTOR (rinit, rtype);
   PUSH_FIELD_VALUE (rinit, "name_length", 
   FINISH_RECORD (rtype);
   START_RECORD_CONSTRUCTOR (rinit, rtype);
   PUSH_FIELD_VALUE (rinit, "name_length", 

-                   build_int_2 (strlen (name), 0));
+                   build_int_cst (NULL_TREE, strlen (name)));

   PUSH_FIELD_VALUE (rinit, "resource_length", 
   PUSH_FIELD_VALUE (rinit, "resource_length", 

-                   build_int_2 (length, 0));
+                   build_int_cst (NULL_TREE, length));

   data = build_string (strlen(name) + length, buffer);
   TREE_TYPE (data) = data_type;
   PUSH_FIELD_VALUE (rinit, "data", data);
   data = build_string (strlen(name) + length, buffer);
   TREE_TYPE (data) = data_type;
   PUSH_FIELD_VALUE (rinit, "data", data);


@@ -92,8 +93,7 @@ compile_resource_data (const char *name, const char *buffer, int length)
   layout_decl (decl, 0);
   pushdecl (decl);
   rest_of_decl_compilation (decl, global_bindings_p (), 0);
   layout_decl (decl, 0);
   pushdecl (decl);
   rest_of_decl_compilation (decl, global_bindings_p (), 0);

-  make_decl_rtl (decl);
-  assemble_variable (decl, 1, 0, 0);
+  cgraph_varpool_finalize_decl (decl);

 
   resources = tree_cons (NULL_TREE, decl, resources);
 }
 
   resources = tree_cons (NULL_TREE, decl, resources);
 }