source: patches/binutils-2.18-branch_update-1.patch @ e9edcbd

bfd/ChangeLog

@@ +1 @@
+2007-10-25  Joseph Myers  <joseph@codesourcery.com>
+
+        * elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Do not add
+        PT_NULL header when not linking.
+
+2007-10-25  Daniel Jacobowitz  <dan@codesourcery.com>
+
+        * elf.c (assign_file_positions_for_load_sections): Trust
+        p_align_valid.
+        (copy_elf_program_header): Copy PT_NULL segments.
+
+2007-09-14  Alan Modra  <amodra@bigpond.net.au>
+
+        * opncls.c (find_separate_debug_file): Ensure bfd_set_error has
+        been called on all error return paths.
+        (bfd_fill_in_gnu_debuglink_section): Use bfd_malloc, not malloc.
+        Clear padding after filename
+
+2007-09-14  Alan Modra  <amodra@bigpond.net.au>
+
+        * format.c (bfd_check_format_matches): Record matching targets even
+        when "matching" is NULL to allow bfd_associated_vector matches.
+        Consolidate error return code.  Consolidate ok return code.  Always
+        restore original target and format on error.
+
+2007-08-28  Daniel Jacobowitz  <dan@codesourcery.com>
+
+        * Makefile.am (RELEASE): Unset.
+        * Makefile.in: Regenerated.
+
 2007-08-28  Daniel Jacobowitz  <dan@codesourcery.com>
 
         * configure.in (VERSION): Update.

binutils-2.18

@@ -4082 +4082 @@
 
           p->p_align = maxpagesize;
         }
-      else if (m->count == 0)
-        p->p_align = 1 << bed->s->log_file_align;
       else if (m->p_align_valid)
         p->p_align = m->p_align;
+      else if (m->count == 0)
+        p->p_align = 1 << bed->s->log_file_align;
       else
         p->p_align = 0;
 
@@ -5563 +5563 @@
       asection *first_section = NULL;
       asection *lowest_section = NULL;
 
-      /* FIXME: Do we need to copy PT_NULL segment?  */
-      if (segment->p_type == PT_NULL)
-        continue;
-
       /* Compute how many sections are in this segment.  */
       for (section = ibfd->sections, section_count = 0;
            section != NULL;

bfd/elfxx-mips.c

@@ -9325 +9325 @@
 
 bfd_boolean
 _bfd_mips_elf_modify_segment_map (bfd *abfd,
-                                  struct bfd_link_info *info ATTRIBUTE_UNUSED)
+                                  struct bfd_link_info *info)
 {
   asection *s;
   struct elf_segment_map *m, **pm;
@@ -9550 +9550 @@
      header instead, and avoid the need to move any sections.
      There is a long tradition of allocating spare dynamic tags,
      so allocating a spare program header seems like a natural
-     extension.  */
-  if (!SGI_COMPAT (abfd)
+     extension.
+
+     If INFO is NULL, we may be copying an already prelinked binary
+     with objcopy or strip, so do not add this header.  */
+  if (info != NULL
+      && !SGI_COMPAT (abfd)
       && bfd_get_section_by_name (abfd, ".dynamic"))
     {
       for (pm = &elf_tdata (abfd)->segment_map; *pm != NULL; pm = &(*pm)->next)

bfd/format.c

@@ -125 +125 @@
   int match_count;
   int ar_match_index;
 
+  if (matching != NULL)
+    *matching = NULL;
+
   if (!bfd_read_p (abfd)
       || (unsigned int) abfd->format >= (unsigned int) bfd_type_end)
     {
@@ -141 +144 @@
   match_count = 0;
   ar_match_index = _bfd_target_vector_entries;
 
-  if (matching)
+  if (matching != NULL || *bfd_associated_vector != NULL)
     {
       bfd_size_type amt;
 
-      *matching = NULL;
       amt = sizeof (*matching_vector) * 2 * _bfd_target_vector_entries;
       matching_vector = bfd_malloc (amt);
       if (!matching_vector)
@@ -162 +164 @@
   if (!abfd->target_defaulted)
     {
       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) /* rewind! */
-        {
-          if (matching)
-            free (matching_vector);
-          return FALSE;
-        }
+        goto err_ret;
 
       right_targ = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
 
       if (right_targ)
-        {
-          abfd->xvec = right_targ;      /* Set the target as returned.  */
-
-          if (matching)
-            free (matching_vector);
-
-          /* If the file was opened for update, then `output_has_begun'
-             some time ago when the file was created.  Do not recompute
-             sections sizes or alignments in _bfd_set_section_contents.
-             We can not set this flag until after checking the format,
-             because it will interfere with creation of BFD sections.  */
-          if (abfd->direction == both_direction)
-            abfd->output_has_begun = TRUE;
-
-          return TRUE;                  /* File position has moved, BTW.  */
-        }
+        goto ok_ret;
 
       /* For a long time the code has dropped through to check all
          targets if the specified target was wrong.  I don't know why,
@@ -201 +184 @@
          this sort, I changed this test to check only for the binary
          target.  */
       if (format == bfd_archive && save_targ == &binary_vec)
-        {
-          abfd->xvec = save_targ;
-          abfd->format = bfd_unknown;
-
-          if (matching)
-            free (matching_vector);
-
-          bfd_set_error (bfd_error_file_not_recognized);
-
-          return FALSE;
-        }
+        goto err_unrecog;
     }
 
   for (target = bfd_target_vector; *target != NULL; target++)
@@ -227 +200 @@
       abfd->xvec = *target;     /* Change BFD's target temporarily.  */
 
       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-        {
-          if (matching)
-            free (matching_vector);
-          return FALSE;
-        }
+        goto err_ret;
 
       /* If _bfd_check_format neglects to set bfd_error, assume
          bfd_error_wrong_format.  We didn't used to even pay any
@@ -255 +224 @@
               break;
             }
 
-          if (matching)
+          if (matching_vector)
             matching_vector[match_count] = temp;
-
           match_count++;
         }
       else if ((err = bfd_get_error ()) == bfd_error_wrong_object_format
@@ -268 +236 @@
              no better matches.  */
           if (ar_right_targ != bfd_default_vector[0])
             ar_right_targ = *target;
-          if (matching)
+          if (matching_vector)
             matching_vector[ar_match_index] = *target;
           ar_match_index++;
         }
       else if (err != bfd_error_wrong_format)
-        {
-          abfd->xvec = save_targ;
-          abfd->format = bfd_unknown;
-
-          if (matching)
-            free (matching_vector);
-
-          return FALSE;
-        }
+        goto err_ret;
     }
 
   if (match_count == 0)
@@ -297 +257 @@
         {
           match_count = ar_match_index - _bfd_target_vector_entries;
 
-          if (matching && match_count > 1)
+          if (matching_vector && match_count > 1)
             memcpy (matching_vector,
                     matching_vector + _bfd_target_vector_entries,
                     sizeof (*matching_vector) * match_count);
         }
     }
 
-  if (match_count > 1
-      && bfd_associated_vector != NULL
-      && matching)
+  if (match_count > 1)
     {
       const bfd_target * const *assoc = bfd_associated_vector;
 
@@ -328 +286 @@
 
   if (match_count == 1)
     {
+    ok_ret:
       abfd->xvec = right_targ;          /* Change BFD's target permanently.  */
 
-      if (matching)
-        free (matching_vector);
-
       /* If the file was opened for update, then `output_has_begun'
          some time ago when the file was created.  Do not recompute
          sections sizes or alignments in _bfd_set_section_contents.
@@ -341 +297 @@
       if (abfd->direction == both_direction)
         abfd->output_has_begun = TRUE;
 
+      if (matching_vector)
+        free (matching_vector);
       return TRUE;                      /* File position has moved, BTW.  */
     }
 
-  abfd->xvec = save_targ;               /* Restore original target type.  */
-  abfd->format = bfd_unknown;           /* Restore original format.  */
-
   if (match_count == 0)
     {
+    err_unrecog:
       bfd_set_error (bfd_error_file_not_recognized);
-
-      if (matching)
+    err_ret:
+      abfd->xvec = save_targ;
+      abfd->format = bfd_unknown;
+      if (matching_vector)
         free (matching_vector);
+      return FALSE;
     }
-  else
-    {
-      bfd_set_error (bfd_error_file_ambiguously_recognized);
 
-      if (matching)
+  abfd->xvec = save_targ;               /* Restore original target type.  */
+  abfd->format = bfd_unknown;           /* Restore original format.  */
+  bfd_set_error (bfd_error_file_ambiguously_recognized);
+
+  if (matching)
+    {
+      *matching = (char **) matching_vector;
+      matching_vector[match_count] = NULL;
+      /* Return target names.  This is a little nasty.  Maybe we
+         should do another bfd_malloc?  */
+      while (--match_count >= 0)
         {
-          *matching = (char **) matching_vector;
-          matching_vector[match_count] = NULL;
-          /* Return target names.  This is a little nasty.  Maybe we
-             should do another bfd_malloc?  */
-          while (--match_count >= 0)
-            {
-              const char *name = matching_vector[match_count]->name;
-              *(const char **) &matching_vector[match_count] = name;
-            }
+          const char *name = matching_vector[match_count]->name;
+          *(const char **) &matching_vector[match_count] = name;
         }
     }
-
   return FALSE;
 }
 

bfd/opncls.c

@@ -1216 +1216 @@
   char *debugfile;
   unsigned long crc32;
   int i;
+  size_t dirlen;
 
   BFD_ASSERT (abfd);
   if (debug_file_directory == NULL)
     debug_file_directory = ".";
 
   /* BFD may have been opened from a stream.  */
-  if (! abfd->filename)
-    return NULL;
+  if (abfd->filename == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return NULL;
+    }
 
   basename = get_debug_link_info (abfd, & crc32);
   if (basename == NULL)
     return NULL;
 
-  if (strlen (basename) < 1)
+  if (basename[0] == '\0')
     {
       free (basename);
+      bfd_set_error (bfd_error_no_debug_section);
       return NULL;
     }
 
-  dir = strdup (abfd->filename);
+  for (dirlen = strlen (abfd->filename); dirlen > 0; dirlen--)
+    if (IS_DIR_SEPARATOR (abfd->filename[dirlen - 1]))
+      break;
+
+  dir = bfd_malloc (dirlen + 1);
   if (dir == NULL)
     {
       free (basename);
       return NULL;
     }
-  BFD_ASSERT (strlen (dir) != 0);
-
-  /* Strip off filename part.  */
-  for (i = strlen (dir) - 1; i >= 0; i--)
-    if (IS_DIR_SEPARATOR (dir[i]))
-      break;
+  memcpy (dir, abfd->filename, dirlen);
+  dir[dirlen] = '\0';
 
-  dir[i + 1] = '\0';
-  BFD_ASSERT (dir[i] == '/' || dir[0] == '\0');
-
-  debugfile = malloc (strlen (debug_file_directory) + 1
-                      + strlen (dir)
-                      + strlen (".debug/")
-                      + strlen (basename)
-                      + 1);
+  debugfile = bfd_malloc (strlen (debug_file_directory) + 1
+                          + dirlen
+                          + strlen (".debug/")
+                          + strlen (basename)
+                          + 1);
   if (debugfile == NULL)
     {
       free (basename);
@@ -1434 +1436 @@
   FILE * handle;
   static unsigned char buffer[8 * 1024];
   size_t count;
+  size_t filelen;
 
   if (abfd == NULL || sect == NULL || filename == NULL)
     {
@@ -1463 +1466 @@
      now that we no longer need them.  */
   filename = lbasename (filename);
 
-  debuglink_size = strlen (filename) + 1;
+  filelen = strlen (filename);
+  debuglink_size = filelen + 1;
   debuglink_size += 3;
   debuglink_size &= ~3;
   debuglink_size += 4;
 
-  contents = malloc (debuglink_size);
+  contents = bfd_malloc (debuglink_size);
   if (contents == NULL)
     {
       /* XXX Should we delete the section from the bfd ?  */
-      bfd_set_error (bfd_error_no_memory);
       return FALSE;
     }
 
-  strcpy (contents, filename);
   crc_offset = debuglink_size - 4;
+  memcpy (contents, filename, filelen);
+  memset (contents + filelen, 0, crc_offset - filelen);
 
   bfd_put_32 (abfd, crc32, contents + crc_offset);
 

bfd/version.h

@@ -1 @@
-#define BFD_VERSION_DATE 20070828
+#define BFD_VERSION_DATE 20071026
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@

binutils-2.18

@@ -4 +4 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-04-29'
+timestamp='2007-08-29'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -479 +479 @@
                 basic_machine=cr16c-unknown
                 os=-elf
                 ;;
+        cr16)
+                basic_machine=cr16-unknown
+                os=-elf
+                ;;
         crds | unos)
                 basic_machine=m68k-crds
                 ;;

binutils-2.18

@@ -6128 +6128 @@
     # For an installed makeinfo, we require it to be from texinfo 4.4 or
     # higher, else we use the "missing" dummy.
     if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
+       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
       :
     else
       MAKEINFO="$MISSING makeinfo"

configure.ac

@@ -158 +158 @@
 # know that we are building the simulator.
 # binutils, gas and ld appear in that order because it makes sense to run
 # "make check" in that particular order.
-host_tools="byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
+host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \
@@ -2403 +2403 @@
     # For an installed makeinfo, we require it to be from texinfo 4.4 or
     # higher, else we use the "missing" dummy.
     if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
+       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
       :
     else
       MAKEINFO="$MISSING makeinfo"

gprof/ChangeLog

@@ +1 @@
+2007-08-30  Nick Clifton  <nickc@redhat.com>
+
+        * po/fi.po: Updated Finnish translation.
+
 2007-08-24  Daniel Jacobowitz  <dan@codesourcery.com>
 
         * po/sv.po: Updated Swedish translation.

gprof/po/fi.po

@@ -8 +8 @@
 "Project-Id-Version: gprof 2.17.90\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-05-15 16:49+0930\n"
-"PO-Revision-Date: 2007-08-10 16:17+0300\n"
+"PO-Revision-Date: 2007-08-29 20:12+0300\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -23 +23 @@
 #: alpha.c:107 mips.c:59
 #, c-format
 msgid "[find_call] %s: 0x%lx to 0x%lx\n"
-msgstr "[find_call] %s: 0x%lx to 0x%lx\n"
+msgstr "[etsi_kutsu] %s: 0x%lx arvoon 0x%lx\n"
 
 #: alpha.c:129
 #, c-format
 msgid "[find_call] 0x%lx: jsr%s <indirect_child>\n"
-msgstr "[find_call] 0x%lx: jsr%s <indirect_child>\n"
+msgstr "[etsi_kutsu] 0x%lx: jsr%s-kÀsky <epÀsuora_lapsi>\n"
 
 #: alpha.c:139
 #, c-format
 msgid "[find_call] 0x%lx: bsr"
-msgstr "[find_call] 0x%lx: bsr"
+msgstr "[etsi_kutsu] 0x%lx: bsr-kÀsky"
 
 #  ensimmÀinen %s whoami, toinen %s filename
 #: basic_blocks.c:128 call_graph.c:89 hist.c:105
@@ -51 +51 @@
 #: basic_blocks.c:289 basic_blocks.c:299
 #, c-format
 msgid "%s:%d: (%s:0x%lx) %lu executions\n"
-msgstr "%s:%d: (%s:0x%lx) %lu suorituksia\n"
+msgstr "%s:%d: (%s:0x%lx) %lu suoritusta\n"
 
 #: basic_blocks.c:290 basic_blocks.c:300
 msgid "<unknown>"
@@ -125 +125 @@
 "\t\t     Call graph (explanation follows)\n"
 "\n"
 msgstr ""
-"\t\t     Kutsugrafiikka (selitys seuraa)\n"
+"\t\t     Kutsugraafi (selitys seuraa)\n"
 "\n"
 
 #: cg_print.c:75
@@ -134 +134 @@
 "\t\t\tCall graph\n"
 "\n"
 msgstr ""
-"\t\t\tKutsugrafiikka\n"
+"\t\t\tKutsugraafi\n"
 "\n"
 
 #: cg_print.c:78 hist.c:466
@@ -256 +256 @@
 #: corefile.c:177
 #, c-format
 msgid "%s: can't find .text section in %s\n"
-msgstr "%s: ei löydy \".text\"-lohkoa kohteesta %s\n"
+msgstr "%s: ei löydy ”.text”-lohkoa kohteesta %s\n"
 
 #: corefile.c:252
 #, c-format
@@ -276 +276 @@
 #: corefile.c:470
 #, c-format
 msgid "%s: file `%s' has no symbols\n"
-msgstr "%s: tiedostossa \"%s\" ei ole symboleja\n"
+msgstr "%s: tiedostossa ”%s” ei ole symboleja\n"
 
 #: corefile.c:772
 #, c-format
@@ -296 +296 @@
 #: gmon_io.c:330 gmon_io.c:459
 #, c-format
 msgid "%s: file `%s' has bad magic cookie\n"
-msgstr "%s: tiedostossa \"%s\" on virheellinen maaginen pipari\n"
+msgstr "%s: tiedostossa ”%s” on virheellinen maaginen pipari\n"
 
 #: gmon_io.c:341
 #, c-format
 msgid "%s: file `%s' has unsupported version %d\n"
-msgstr "%s: tiedostossa \"%s\" on tukematon versio %d\n"
+msgstr "%s: tiedostossa ”%s” on tukematon versio %d\n"
 
 #: gmon_io.c:371
 #, c-format
@@ -321 +321 @@
 #: gmon_io.c:516
 #, c-format
 msgid "%s: file '%s' does not appear to be in gmon.out format\n"
-msgstr "%s: tiedosto \"%s\" ei vaikuta olevan \"gmon.out\"-muotoinen\n"
+msgstr "%s: tiedosto ”%s” ei vaikuta olevan ”gmon.out”-muotoinen\n"
 
 #: gmon_io.c:529
 #, c-format
 msgid "%s: unexpected EOF after reading %d/%d bins\n"
-msgstr "%s: odottamaton tiedoston loppumerkki \"%d/%d bins\"-lukemisen jÀlkeen\n"
+msgstr "%s: odottamaton tiedoston loppumerkki ”%d/%d bins”-lukemisen jÀlkeen\n"
 
 #: gmon_io.c:563
 #, c-format
@@ -341 +341 @@
 #: gmon_io.c:576
 #, c-format
 msgid "File `%s' (version %d) contains:\n"
-msgstr "Tiedosto \"%s\" (versio %d) sisÀltÀÀ:\n"
+msgstr "Tiedosto ”%s” (versio %d) sisÀltÀÀ:\n"
 
 #: gmon_io.c:579
 #, c-format
@@ -356 +356 @@
 #: gmon_io.c:582
 #, c-format
 msgid "\t%d call-graph record\n"
-msgstr "\t%d kutsugrafiikkatietue\n"
+msgstr "\t%d kutsugraafitietue\n"
 
 #: gmon_io.c:583
 #, c-format
 msgid "\t%d call-graph records\n"
-msgstr "\t%d kutsugrafiikkatietueet\n"
+msgstr "\t%d kutsugraafitietueet\n"
 
 #: gmon_io.c:585
 #, c-format
@@ -407 +407 @@
 #: gprof.c:174
 #, c-format
 msgid "Report bugs to %s\n"
-msgstr "Raportoi virheestÀ osoitteeseen %s\n"
+msgstr "LÀhetÀ raportit ohjelmistovioista (englanniksi) osoitteeseen %s\n"
 
 #: gprof.c:250
 #, c-format
 msgid "%s: debugging not supported; -d ignored\n"
-msgstr "%s: debuggausta ei tueta; -d ei oteta huomioon\n"
+msgstr "%s: debuggausta ei tueta; -d:tÀ ei oteta huomioon\n"
 
 #: gprof.c:330
 #, c-format
@@ -428 +428 @@
 #: gprof.c:415
 #, c-format
 msgid "Based on BSD gprof, copyright 1983 Regents of the University of California.\n"
-msgstr "Perustuu BSD gprof, copyright 1983 Regents of the University of California.\n"
+msgstr "Perustuu BSD:n gprofiin, copyright 1983 Regents of the University of California.\n"
 
 #: gprof.c:416
 #, c-format
@@ -438 +438 @@
 #: gprof.c:457
 #, c-format
 msgid "%s: unknown demangling style `%s'\n"
-msgstr "%s: tuntematon eheytystyyli \"%s\"\n"
+msgstr "%s: tuntematon eheytystyyli ”%s”\n"
 
 #: gprof.c:477
 #, c-format
 msgid "%s: Only one of --function-ordering and --file-ordering may be specified.\n"
-msgstr "%s: Vain joko \"--function-ordering\" tai \"--file-ordering\" saadaan mÀÀritellÀ.\n"
+msgstr "%s: Vain joko ”--function-ordering” tai ”--file-ordering” saadaan mÀÀritellÀ.\n"
 
 #: gprof.c:527
 #, c-format
 msgid "%s: sorry, file format `prof' is not yet supported\n"
-msgstr "%s: valitettavasti tiedostomuotoa \"prof\" ei vielÀ tueta\n"
+msgstr "%s: valitettavasti tiedostomuotoa ”prof” ei vielÀ tueta\n"
 
 #: gprof.c:581
 #, c-format
 msgid "%s: gmon.out file is missing histogram\n"
-msgstr "%s: \"gmon.out\"-tiedosto puuttuu histogrammista\n"
+msgstr "%s: ”gmon.out”-tiedosto puuttuu histogrammista\n"
 
 #: gprof.c:588
 #, c-format
 msgid "%s: gmon.out file is missing call-graph data\n"
-msgstr "%s: \"gmon.out\"-tiedosto puuttuu kutsugrafiikkadatasta\n"
+msgstr "%s: ”gmon.out”-tiedosto puuttuu kutsugraafidatasta\n"
 
 #: hist.c:133
 #, c-format
@@ -468 +468 @@
 "%s: to '%s'\n"
 msgstr ""
 "%s: mittasuhdeyksikkö muuttui histogrammitietueiden vÀlillÀ\n"
-"%s: arvosta \"%s\"\n"
-"%s: arvoon \"%s\"\n"
+"%s: arvosta ”%s”\n"
+"%s: arvoon ”%s”\n"
 
 #: hist.c:143
 #, c-format
@@ -479 +479 @@
 "%s: to '%c'\n"
 msgstr ""
 "%s: mittasuhdelyhenne muuttui histogrammitietueiden vÀlillÀ\n"
-"%s: arvosta \"%c\"\n"
-"%s: arvoon \"%c\"\n"
+"%s: arvosta ”%c”\n"
+"%s: arvoon ”%c”\n"
 
 #: hist.c:157
 #, c-format
@@ -508 +508 @@
 " for %.2f%% of %.2f %s\n"
 "\n"
 msgstr ""
-" kohteelle %.2f%% of %.2f %s\n"
+" kohteelle %.2f%% / %.2f %s\n"
 "\n"
 
 #: hist.c:476
@@ -526 +526 @@
 " no time accumulated\n"
 "\n"
 msgstr ""
-" ei akkumuloitunutta aikaa\n"
+" ei kerÀÀntynyttÀ aikaa\n"
 "\n"
 
 #: hist.c:488
@@ -575 +575 @@
 #: mips.c:71
 #, c-format
 msgid "[find_call] 0x%lx: jal"
-msgstr "[find_call] 0x%lx: jal-kÀsky"
+msgstr "[etsi_kutsu] 0x%lx: jal-kÀsky"
 
 #: mips.c:96
 #, c-format
 msgid "[find_call] 0x%lx: jalr\n"
-msgstr "[find_call] 0x%lx: jalr-kÀsky (epÀsuora kutsu)\n"
+msgstr "[etsi_kutsu] 0x%lx: jalr-kÀsky (epÀsuora kutsu)\n"
 
 #: source.c:162
 #, c-format
 msgid "%s: could not locate `%s'\n"
-msgstr "%s: ei voitu paikantaa \"%s\"\n"
+msgstr "%s: ei voitu paikantaa ”%s”\n"
 
 #: source.c:237
 #, c-format