* config/sh/t-symbian: Add rule to build sh-c.o

* config/sh/symbian.c (sh_symbian_mark_dllexport): Replace use
  of DECL_NON_ADDR_CONST_P with DECL_DLLIMPORT_P.
  (sh_symbian_encode_section_info): Likewise.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 506c1e7..6b3d3f6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-18  Nick Clifton  <nickc@redhat.com>
+
+       * config/sh/t-symbian: Add rule to build sh-c.o
+       * config/sh/symbian.c (sh_symbian_mark_dllexport): Replace use
+       of DECL_NON_ADDR_CONST_P with DECL_DLLIMPORT_P.
+       (sh_symbian_encode_section_info): Likewise.
+
 2006-04-18  Andreas Krebbel  <krebbel1@de.ibm.com>
 
        * builtins.c (expand_builtin_strcmp): Cover label definition of 

diff --git a/gcc/config/sh/symbian.c b/gcc/config/sh/symbian.c
index 8568f32..4836d9b 100644 (file)
--- a/gcc/config/sh/symbian.c
+++ b/gcc/config/sh/symbian.c
@@ -233,7 +233,7 @@ sh_symbian_mark_dllexport (tree decl)
        unit which has included the header in order to ensure argument
        correctness.  */
       oldname += strlen (DLL_IMPORT_PREFIX);
-      DECL_NON_ADDR_CONST_P (decl) = 0;
+      DECL_DLLIMPORT_P (decl) = 0;
     }
   else if (sh_symbian_dllexport_name_p (oldname))
     return; /* Already done.  */
@@ -309,7 +309,7 @@ sh_symbian_encode_section_info (tree decl, rtx rtl, int first)
   /* It might be that DECL has already been marked as dllimport, but a
      subsequent definition nullified that.  The attribute is gone but
      DECL_RTL still has (DLL_IMPORT_PREFIX) prefixed. We need to remove
-     that. Ditto for the DECL_NON_ADDR_CONST_P flag.  */
+     that. Ditto for the DECL_DLLIMPORT_P flag.  */
   else if (  (TREE_CODE (decl) == FUNCTION_DECL
           || TREE_CODE (decl) == VAR_DECL)
           && DECL_RTL (decl) != NULL_RTX
@@ -330,7 +330,7 @@ sh_symbian_encode_section_info (tree decl, rtx rtl, int first)
 
       XEXP (DECL_RTL (decl), 0) = newrtl;
 
-      DECL_NON_ADDR_CONST_P (decl) = 0;
+      DECL_DLLIMPORT_P (decl) = 0;
     }
 }
 

diff --git a/gcc/config/sh/t-symbian b/gcc/config/sh/t-symbian
index 494029f..1d15d59 100644 (file)
--- a/gcc/config/sh/t-symbian
+++ b/gcc/config/sh/t-symbian
@@ -1,3 +1,7 @@
+sh-c.o: $(srcdir)/config/sh/sh-c.c \
+  $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(TM_H) $(TM_P_H) coretypes.h
+       $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/sh/sh-c.c
+
 LIB1ASMSRC = sh/lib1funcs.asm
 LIB1ASMFUNCS = _ashiftrt _ashiftrt_n _ashiftlt _lshiftrt _movstr \
   _movstr_i4 _mulsi3 _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr \