Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/binutils/patches/readelf.c.patch
author Brian Reitz <Brian.Reitz@Oracle.COM>
Thu, 28 May 2015 10:11:41 -0700
branchs11-update
changeset 4448 a1595889821c
parent 2493 9911278899a3
permissions -rw-r--r--
21035315 swift missing dependency on network/rsync
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2493
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- binutils-2.23.1/binutils/readelf.c	2012-11-05 08:27:35.000000000 -0800
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
+++ binutils-2.23.1/binutils/readelf.c	2012-12-19 08:07:54.220639084 -0800
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -7284,9 +7284,15 @@
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
   if (!do_unwind)
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
     return;
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
+  /* why do some developers insist on returning from void */
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
   for (i = 0; handlers[i].handler != NULL; i++)
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
+  {
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
     if (elf_header.e_machine == handlers[i].machtype)
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
-      return handlers[i].handler (file);
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+    {
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+      handlers[i].handler (file);
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
+      return;
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
+    }
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
+  }
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
   printf (_("\nThe decoding of unwind sections for machine type %s is not currently supported.\n"),
9911278899a3 15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
 	  get_machine_name (elf_header.e_machine));
upstream/oracle/userland-gate