* config/v850/v850.c (GHS_default_section_names): Change to const

	char * type.
	(GHS_current_section_names): Likewise.
	(v850_insert_attributes): Do not build strings, just assign the
	names directly.  Change the type of 'chosen_section' to const
	char*.
	* config/v850/v850-c.c (ghs_pragma_section): Assign the alias
	directly to the array entry.
	* config/v850/v850.h (GHS_default_section_names): Change to const
	char * type.
	(GHS_current_section_names): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211972 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dcbb23bd4b2f4a421b973441c05d48d75cd2f2f0..79847e3f7ee7fc162d8e4c2a59d77aab472f4a55 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2014-06-25  Nick Clifton  <nickc@redhat.com>
+
+       * config/v850/v850.c (GHS_default_section_names): Change to const
+       char * type.
+       (GHS_current_section_names): Likewise.
+       (v850_insert_attributes): Do not build strings, just assign the
+       names directly.  Change the type of 'chosen_section' to const
+       char*.
+       * config/v850/v850-c.c (ghs_pragma_section): Assign the alias
+       directly to the array entry.
+       * config/v850/v850.h (GHS_default_section_names): Change to const
+       char * type.
+       (GHS_current_section_names): Likewise.
+
 2014-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        * langhooks-def.h (LANG_HOOKS_OMP_CLAUSE_LINEAR_CTOR): Define.

diff --git a/gcc/config/v850/v850-c.c b/gcc/config/v850/v850-c.c
index 4c2e052cf376e582d67e0b293e707a0f8905857f..ffd55e48730eb47f30cef913ececcde935405ffa 100644 (file)
--- a/gcc/config/v850/v850-c.c
+++ b/gcc/config/v850/v850-c.c
@@ -175,8 +175,7 @@ ghs_pragma_section (cpp_reader * pfile ATTRIBUTE_UNUSED)
       if (streq (alias, "default"))
        GHS_current_section_names [kind] = NULL;
       else
-       GHS_current_section_names [kind] =
-         build_string (strlen (alias) + 1, alias);
+       GHS_current_section_names [kind] = alias;
     }
   while (repeat);
 

diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index f736c44bae8cf51ea310ed5abdb413018f78d4d8..02b842780b3e46705837419678091ea2589500b7 100644 (file)
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -54,8 +54,8 @@
 static void v850_print_operand_address (FILE *, rtx);
 
 /* Names of the various data areas used on the v850.  */
-tree GHS_default_section_names [(int) COUNT_OF_GHS_SECTION_KINDS];
-tree GHS_current_section_names [(int) COUNT_OF_GHS_SECTION_KINDS];
+const char * GHS_default_section_names [(int) COUNT_OF_GHS_SECTION_KINDS];
+const char * GHS_current_section_names [(int) COUNT_OF_GHS_SECTION_KINDS];
 
 /* Track the current data area set by the data area pragma (which 
    can be nested).  Tested by check_default_data_area.  */
@@ -2569,19 +2569,19 @@ v850_insert_attributes (tree decl, tree * attr_ptr ATTRIBUTE_UNUSED )
   if (GHS_default_section_names [(int) GHS_SECTION_KIND_SDATA] == NULL)
     {
       GHS_default_section_names [(int) GHS_SECTION_KIND_SDATA]
-       = build_string (sizeof (".sdata")-1, ".sdata");
+       = ".sdata";
 
       GHS_default_section_names [(int) GHS_SECTION_KIND_ROSDATA]
-       = build_string (sizeof (".rosdata")-1, ".rosdata");
+       = ".rosdata";
 
       GHS_default_section_names [(int) GHS_SECTION_KIND_TDATA]
-       = build_string (sizeof (".tdata")-1, ".tdata");
+       = ".tdata";
       
       GHS_default_section_names [(int) GHS_SECTION_KIND_ZDATA]
-       = build_string (sizeof (".zdata")-1, ".zdata");
+       = ".zdata";
 
       GHS_default_section_names [(int) GHS_SECTION_KIND_ROZDATA]
-       = build_string (sizeof (".rozdata")-1, ".rozdata");
+       = ".rozdata";
     }
   
   if (current_function_decl == NULL_TREE
@@ -2592,7 +2592,7 @@ v850_insert_attributes (tree decl, tree * attr_ptr ATTRIBUTE_UNUSED )
       && !DECL_SECTION_NAME (decl))
     {
       enum GHS_section_kind kind = GHS_SECTION_KIND_DEFAULT;
-      tree chosen_section;
+      const char * chosen_section;
 
       if (TREE_CODE (decl) == FUNCTION_DECL)
        kind = GHS_SECTION_KIND_TEXT;

diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index 6ccdc5d65143be482a35a05d0e1a452496065c5d..5df3c1ca5db6fe417529ffd0854500790a659a46 100644 (file)
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -916,7 +916,7 @@ typedef enum
    For the *normal* section kinds (like .data, .text, etc.) we do not
    want to explicitly force the name of these sections, but would rather
    let the linker (or at least the back end) choose the name of the 
-   section, UNLESS the user has force a specific name for these section
+   section, UNLESS the user has forced a specific name for these section
    kinds.  To accomplish this set the name in ghs_default_section_names
    to null.  */
 
@@ -952,8 +952,8 @@ typedef struct data_area_stack_element
 extern data_area_stack_element * data_area_stack;
 
 /* Names of the various data areas used on the v850.  */
-extern tree GHS_default_section_names [(int) COUNT_OF_GHS_SECTION_KINDS];
-extern tree GHS_current_section_names [(int) COUNT_OF_GHS_SECTION_KINDS];
+extern const char * GHS_default_section_names [(int) COUNT_OF_GHS_SECTION_KINDS];
+extern const char * GHS_current_section_names [(int) COUNT_OF_GHS_SECTION_KINDS];
 
 /* The assembler op to start the file.  */