diff --git a/gcc-4.1/gcc/Makefile.in b/gcc-4.1/gcc/Makefile.in
index 295cdae..62479a1 100644
--- a/gcc-4.1/gcc/Makefile.in
+++ b/gcc-4.1/gcc/Makefile.in
@@ -1062,15 +1062,15 @@ LIBGCOV = _gcov _gcov_merge_add _gcov_merge_single _gcov_merge_delta \
     _gcov_execv _gcov_execvp _gcov_execve \
     _gcov_interval_profiler _gcov_pow2_profiler _gcov_one_value_profiler
 
-FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \
+FPBIT_FUNCS = _pack_sf _unpack_sf 	     	    	     \
     _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \
-    _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \
-    _sf_to_df _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf
+    _lt_sf _le_sf _unord_sf 	      	        _negate_sf _make_sf \
+              _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf
 
-DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
+DPBIT_FUNCS = _pack_df _unpack_df			     \
     _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \
-    _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \
-    _df_to_sf _df_to_tf _thenan_df _df_to_usi _usi_to_df
+    _lt_df _le_df _unord_df		        _negate_df _make_df \
+              _df_to_tf _thenan_df _df_to_usi _usi_to_df
 
 TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \
     _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \
diff --git a/gcc-4.1/gcc/config/nios2/nios2.c b/gcc-4.1/gcc/config/nios2/nios2.c
index f8cdb9d..c91b41a 100644
--- a/gcc-4.1/gcc/config/nios2/nios2.c
+++ b/gcc-4.1/gcc/config/nios2/nios2.c
@@ -309,21 +309,22 @@ nios2_current_function_name (void)
 {
   rtx func_decl_rtx, func_decl_exp_rtx;
   const char *function_name;
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
   gcc_assert (TREE_CODE (current_function_decl) == FUNCTION_DECL);
-
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
   func_decl_rtx = DECL_RTL(current_function_decl);
-
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
   gcc_assert (GET_CODE(func_decl_rtx) == MEM);
-
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
   func_decl_exp_rtx = XEXP (func_decl_rtx, 0);
-
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
   gcc_assert (GET_CODE(func_decl_exp_rtx) == SYMBOL_REF);
-
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
   function_name = XSTR (func_decl_exp_rtx,0);
-
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
   gcc_assert (function_name != NULL);
-
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
   return function_name;
 
 }
@@ -335,7 +336,7 @@ nios2_compute_func_type (void)
   unsigned long type = NIOS2_FT_UNKNOWN;
   tree a;
   tree attr;
-
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
   gcc_assert (TREE_CODE (current_function_decl) == FUNCTION_DECL);
 
   attr = DECL_ATTRIBUTES (current_function_decl);
@@ -350,32 +351,39 @@ nios2_compute_func_type (void)
     type |= NIOS2_FT_NORMAL;
   else 
     type |= NIOS2_FT_TASK;
-
+  fprintf(stderr, "%s: %s:%d type -> %d \n",__func__, __FILE__,__LINE__, type);
   return type;
 }
 
+  static int cycle = 0;
 /* Returns the type of the current function.  */
 unsigned long
 nios2_current_func_type (void)
 {
+  fprintf(stderr, "%s: %s:%d %d\n",__func__, __FILE__,__LINE__, cycle++);
   if (NIOS2_FUNC_TYPE (cfun->machine->func_type) == NIOS2_FT_UNKNOWN)
     cfun->machine->func_type = nios2_compute_func_type ();
-
+  fprintf(stderr, "%s: %s:%d     %d \n",__func__, __FILE__,__LINE__,
+	  cfun->machine->func_type);
+  if (cycle >= 16 ) abort();
   return cfun->machine->func_type;
 }
 
 int
 nios2_naked_function_p(void) 
 {
+fprintf(stderr, "%s: %s:%d *** \n",__func__, __FILE__,__LINE__);
+
   return IS_NAKED (nios2_current_func_type ());
 }
 
 bool
 nios2_use_reg_for_func (void)
 {
+fprintf(stderr, "%s: %s:%d +++ \n",__func__, __FILE__,__LINE__);
   /* Never spill function parameters to the stack if the function
      is naked.  */
-  return IS_NAKED (nios2_current_func_type ());
+  return IS_NORMAL (nios2_current_func_type ());
 }
 
 static void
@@ -1921,6 +1929,7 @@ nios2_emit_expensive_div (rtx *operands, enum machine_mode mode)
 void
 nios2_adjust_call_address (rtx *addr)
 {
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
   if (flag_pic
       && (GET_CODE (*addr) == SYMBOL_REF || GET_CODE (*addr) == LABEL_REF))
     {
@@ -1930,6 +1939,7 @@ nios2_adjust_call_address (rtx *addr)
       *addr = gen_reg_rtx (GET_MODE (addr_orig));
       emit_insn (gen_pic_load_call_addr (*addr,
 					 pic_offset_table_rtx, addr_orig));
+fprintf(stderr, "%s: %s:%d\n",__func__, __FILE__,__LINE__);
     }
 }
 
diff --git a/gcc-4.1/gcc/config/nios2/nios2.h b/gcc-4.1/gcc/config/nios2/nios2.h
index 909343e..9fe6ab0 100644
--- a/gcc-4.1/gcc/config/nios2/nios2.h
+++ b/gcc-4.1/gcc/config/nios2/nios2.h
@@ -942,6 +942,7 @@ typedef struct nios2_args
 #define NIOS2_FUNC_TYPE(t)	(t & NIOS2_FT_TYPE_MASK)
 #define IS_TASK(t)     	        (t & NIOS2_FT_TASK)
 #define IS_NAKED(t)        	(t & NIOS2_FT_NAKED)
+#define IS_NORMAL(t)        	(t & NIOS2_FT_NORMAL)
 
 
 /*******************
diff --git a/gcc-4.1/gcc/crtstuff.c b/gcc-4.1/gcc/crtstuff.c
index a712e4e..4e86d6f 100644
--- a/gcc-4.1/gcc/crtstuff.c
+++ b/gcc-4.1/gcc/crtstuff.c
@@ -317,8 +317,7 @@ static func_ptr __do_global_dtors_aux_fini_array_entry[]
 /* Stick a call to __register_frame_info into the .init section.  For some
    reason calls with no arguments work more reliably in .init, so stick the
    call in another function.  */
-
-static void __attribute__((used))
+static void
 frame_dummy (void)
 {
 #ifdef USE_EH_FRAME_REGISTRY
diff --git a/gcc-4.1/libjava/classpath/scripts/loc b/gcc-4.1/libjava/classpath/scripts/loc
index dc2f327..2cba564 100755
--- a/gcc-4.1/libjava/classpath/scripts/loc
+++ b/gcc-4.1/libjava/classpath/scripts/loc
@@ -19,7 +19,7 @@
 
 
 MODE=$1
-if test "$MODE" == "-l"; then
+if test "$MODE" = "-l"; then
     COMMAND='(locate \*.jar ; locate \*.war)'
     shift
 else
@@ -27,7 +27,7 @@ else
 fi
 
 FOO=$2
-if test "x$FOO" == "x"; then
+if test "x$FOO" = "x"; then
     FOO=/usr/share/java
 fi