source: rtems-tools/tools/4.11/gcc/nios2/nios2-gcc-4.1-rtems-20110818.diff @ e42bad3

config-ml.in

@@ -892 +892 @@
         fi
     fi
 
-    if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
-        --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
-        ${ac_configure_args} ${ml_srcdiroption} ; then
-      true
-    else
-      exit 1
-    fi
+    case $(uname) in
+        MINGW32*)
+            #
+            # Work around bugs in MSYS sed or bash. The CC in
+            # ${ac_configure_args} overrides the CC built above
+            # I do not know if the CC should have been stripped
+            # before this script. It seems sed in MSYS does not
+            # handle:
+            #    $ echo "'XX=hello' 'YY=world' 'CC=gcc -O3'" | sed -e "s/\'CC=.*\'//g"
+            #
+            tmp_IFS=$IFS
+            IFS="'"
+            tmp__ac_configure_args=
+            for o in ${ac_configure_args}
+            do
+                o=$(echo $o | sed -e 's/ *$//g')
+                case $o in
+                    CC=*) ;;
+                    '') ;;
+                    *) tmp__ac_configure_args="${tmp__ac_configure_args} "\'$o\' ;;
+                esac
+            done
+            IFS=$tmp_IFS
+
+            if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
+                --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
+                ${tmp__ac_configure_args} ${ml_srcdiroption} ; then
+                true
+            else
+                exit 1
+            fi
+            ;;
+        *)
+            if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
+                --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
+                ${ac_configure_args} ${ml_srcdiroption} ; then
+                true
+            else
+                exit 1
+            fi
+            ;;
+    esac
 
     cd ${ML_POPDIR}
 

gcc/DEV-PHASE

@@ +1 @@
+RTEMS (chrisj@rtems.org) NIOS2 gcc-4.1-11.0/newlib-1.19.0

gcc/config/nios2/crti.asm

@@ -67 +67 @@
         stw     r16, 12(sp)
         stw     fp, 8(sp)
         addi    fp, sp, 8
+
+#if !defined(__rtems__)
+/* FIXME: Disabled for now.
+ * Causes undefined refs to _GLOBAL_OFFSET_TABLE_
+ */
         nextpc  r22
 #ifdef __nios2_6b__
 1:      movhi20 r2, %hi20adj(_GLOBAL_OFFSET_TABLE_ - 1b)
@@ -76 +81 @@
         addi    r2, r2, %lo(_GLOBAL_OFFSET_TABLE_ - 1b)
 #endif
         add     r22, r22, r2
-        
+#endif
         
         .section        ".fini"
         .align  2
@@ -94 +99 @@
         stw     r16, 12(sp)
         stw     fp, 8(sp)
         addi    fp, sp, 8
+
+#if !defined(__rtems__)
+/* FIXME: Disabled for now.
+ * Causes undefined refs to _GLOBAL_OFFSET_TABLE_ 
+ */
         nextpc  r22
 #ifdef __nios2_6b__
 1:      movhi20 r2, %hi20adj(_GLOBAL_OFFSET_TABLE_ - 1b)
@@ -102 +112 @@
 1:      movhi   r2, %hiadj(_GLOBAL_OFFSET_TABLE_ - 1b)
         addi    r2, r2, %lo(_GLOBAL_OFFSET_TABLE_ - 1b)
 #endif
-        
         add     r22, r22, r2
-        
-
+#endif

gcc/config/nios2/nios2-protos.h

@@ -88 +88 @@
 extern int nios2_return_in_memory (tree);
 
 #endif /* TREE_CODE */
+
+rtx nios2_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode);

gcc/config/nios2/rtems.h

@@ +1 @@
+/* Definitions for rtems targeting a NIOS2 using ELF.
+   Copyright (C) 2011 Free Software Foundation, Inc.
+   Contributed by Chris Johns (chrisj@rtems.org).
+
+This file is part of GCC.
+
+GCC 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, or (at your option)
+any later version.
+
+GCC 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 GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+/* Specify predefined symbols in preprocessor.  */
+
+#define TARGET_OS_CPP_BUILTINS()        \
+do {                                    \
+  builtin_define ("__rtems__");         \
+  builtin_define ("__USE_INIT_FINI__"); \
+  builtin_assert ("system=rtems");      \
+} while (0)

gcc/config/nios2/t-rtems

@@ +1 @@
+# Multilibs for NIOS2 RTEMS targets.
+
+# Use all.
+

gcc/config.gcc

@@ -1447 +1447 @@
                 thread_file='posix'
         fi
         ;;
+nios2-*-rtems*)
+        tm_file=" elfos.h ${tm_file} dbxelf.h nios2/rtems.h rtems.h"
+        tmake_file="${tmake_file} nios2/t-nios2 t-rtems nios2/t-rtems"
+        ;;
 nios2*-*-*)
         tm_file="elfos.h ${tm_file}"
         tmake_file="${tmake_file} nios2/t-nios2"

libiberty/strsignal.c

@@ -404 +404 @@
 
 #ifndef HAVE_STRSIGNAL
 
-const char *
+char *
 strsignal (int signo)
 {
-  const char *msg;
+  char *msg;
   static char buf[32];
 
 #ifndef HAVE_SYS_SIGLIST
@@ -428 +428 @@
     {
       /* In range, but no sys_siglist or no entry at this index. */
       sprintf (buf, "Signal %d", signo);
-      msg = (const char *) buf;
+      msg = buf;
     }
   else
     {
       /* In range, and a valid message.  Just return the message. */
-      msg = (const char *) sys_siglist[signo];
+      msg = (char *) sys_siglist[signo];
     }
   
   return (msg);
@@ -549 +549 @@
 #ifndef HAVE_PSIGNAL
 
 void
-psignal (unsigned signo, char *message)
+psignal (int signo, const char *message)
 {
   if (signal_names == NULL)
     {