Adding option

   --format-universalnumber=<n>
so if reading a Mach-O universal binary
one can select which executable from that
universal binary libdwarf should read.
	modified:   src/bin/dwarfdump/dd_command_options.c
	modified:   src/bin/dwarfdump/dd_glflags.c
	modified:   src/bin/dwarfdump/dd_glflags.h
	modified:   src/bin/dwarfdump/dwarfdump.c

Author: davea42

src/bin/dwarfdump/dd_command_options.c

@@ -358,6 +358,7 @@ static void arg_format_suppress_utf8(void);
 static void arg_format_file(void);
 static void arg_format_gcc(void);
 static void arg_format_groupnumber(void);
+static void arg_format_universalnumber(void);
 static void arg_format_limit(void);
 static void arg_format_producer(void);
 static void arg_format_snc(void);
@@ -596,6 +597,10 @@ static const char *usage_long_text[] = {
 "-u<file> --format-file=<file>  Print only specified file (CU name)",
 "-x groupnumber=<n>    ",
 "         --format-group-number=<n> Groupnumber to print",
+"-x universalnumber=<n>    ",
+"         --format-universalnumber=<n> Groupnumber to print",
+"                               non-zero only applies to",
+"                               Mach-O universal binaries.",
 "-H<num>  --format-limit=<num>  Limit output to the first <num>",
 "                               major units.",
 "                               Stop after <num> compilation units",
@@ -739,11 +744,16 @@ OPT_FORMAT_SUPPRESS_URI,      /* -U   --format-suppress-uri    */
 OPT_FORMAT_SUPPRESS_URI_MSG,  /* -q   --format-suppress-uri-msg  */
 
 OPT_FORMAT_SUPPRESS_UTF8,     /*  --format-suppress-utf8 */
+OPT_FORMAT_UNIVERSALNUMBER,   /*  --format-universalnumber */
 
 /* Print Output Limiters    */
 OPT_FORMAT_FILE,              /* -u<file> --format-file=<file> */
 OPT_FORMAT_GCC,               /* -cg      --format-gcc         */
 OPT_FORMAT_GROUP_NUMBER,      /* -x<n>  --format-group-number=<n>*/
+
+/* -x<n>  --format-universalnumber=<n>*/
+OPT_FORMAT_GROUP_UNIVERSALNUMBER,
+
 OPT_FORMAT_LIMIT,             /* -H<num>  --format-limit=<num>   */
 OPT_FORMAT_PRODUCER,          /* -c<str>  --format-producer=<str> */
 OPT_FORMAT_SNC,               /* -cs      --format-snc           */
@@ -893,6 +903,8 @@ OPT_FORMAT_SUPPRESS_OFFSETS },
 {"format-gcc",          dwno_argument,       0, OPT_FORMAT_GCC },
 {"format-group-number", dwrequired_argument, 0,
     OPT_FORMAT_GROUP_NUMBER},
+{"format-universalnumber", dwrequired_argument, 0,
+    OPT_FORMAT_UNIVERSALNUMBER},
 {"format-limit",        dwrequired_argument, 0, OPT_FORMAT_LIMIT },
 {"format-producer",     dwrequired_argument, 0, OPT_FORMAT_PRODUCER},
 {"format-snc",          dwno_argument,       0, OPT_FORMAT_SNC },
@@ -2148,6 +2160,9 @@ void arg_x_multiple_selection(void)
     } else if (strncmp(dwoptarg,"groupnumber=",12) == 0) {
         dwoptarg = &dwoptarg[12];
         arg_format_groupnumber();
+    } else if (strncmp(dwoptarg,"universalnumber=",16) == 0) {
+        dwoptarg = &dwoptarg[12];
+        arg_format_universalnumber();
     } else if (strncmp(dwoptarg,"tied=",5) == 0) {
         dwoptarg = &dwoptarg[5];
         arg_file_tied();
@@ -2187,6 +2202,32 @@ arg_file_abi(void)
     }
 }
 
+/*  Option '-x universalnumber='
+    greater than zero only applies to Mach-O universal
+    object files*/
+static void
+arg_format_universalnumber(void)
+{
+    /*  By default prints the lowest universal number in the object.
+        Default is  -x universalnumber=0 */
+
+    long int gnum = 0;
+    int res = 0;
+
+    if (!dwoptarg || !dwoptarg[0]) {
+        printf("ERROR *groupnumber= does not allow an empty text\n");
+        glflags.gf_count_major_errors++;
+        arg_usage_error = TRUE;
+        return;
+    }
+    res = get_number_value(dwoptarg,&gnum);
+    if (res == DW_DLV_OK && gnum >= 0) {
+        glflags.gf_universalnumber = gnum;
+    } else {
+        arg_x_invalid();
+    }
+}
+
 /*  Option '-x groupnumber=' */
 static void
 arg_format_groupnumber(void)
@@ -2510,6 +2551,8 @@ set_command_options(int argc, char *argv[])
         case OPT_FORMAT_FILE:         arg_format_file();       break;
         case OPT_FORMAT_GCC:          arg_format_gcc();        break;
         case OPT_FORMAT_GROUP_NUMBER: arg_format_groupnumber(); break;
+        case OPT_FORMAT_UNIVERSALNUMBER: arg_format_universalnumber();
+            break;
         case OPT_FORMAT_LIMIT:        arg_format_limit();      break;
         case OPT_FORMAT_PRODUCER:     arg_format_producer();   break;
         case OPT_FORMAT_SNC:          arg_format_snc();        break;

src/bin/dwarfdump/dd_glflags.c

@@ -316,6 +316,7 @@ init_global_flags(void)
     /*  Output filename */
     glflags.output_file = 0;
     glflags.group_number = 0;
+    glflags.gf_universalnumber = 0;/* for Mach-O universal binaries */
 
     /*  Global esb-buffers. */
     glflags.newprogname = &_newprogname;

src/bin/dwarfdump/dd_glflags.h

@@ -378,7 +378,8 @@ struct glflags_s {
 
     /* Output filename */
     const char *output_file;
-    int group_number;
+    int         group_number;
+    unsigned gf_universalnumber; /* for Mach-O universal binaries*/
 
     /*  Global esb-buffers. */
     struct esb_s *newprogname;

src/bin/dwarfdump/dwarfdump.c

@@ -561,6 +561,7 @@ main(int argc, char *argv[])
         glflags.gf_count_major_errors++;
     } else if (ftype == DW_FTYPE_ELF ||
         ftype ==  DW_FTYPE_MACH_O  ||
+        ftype ==  DW_FTYPE_APPLEUNIVERSAL  ||
         ftype == DW_FTYPE_PE  ) {
         flag_data_pre_allocation();
         close_a_file(global_basefd);
@@ -913,9 +914,10 @@ process_one_file(
             tb = 0;
             tblen = 0;
         }
-        dres = dwarf_init_path_dl(file_name,
+        dres = dwarf_init_path_dl_a(file_name,
             tb,tblen,
             glflags.group_number,
+            glflags.gf_universalnumber,
             NULL, NULL, &dbg,
             glflags.gf_global_debuglink_paths,
             glflags.gf_global_debuglink_count,
@@ -951,10 +953,11 @@ process_one_file(
         {
             /*  The tied file we define as group 1, BASE.
                 Cannot follow debuglink or dSYM,
-                is a tied file */
-            dres = dwarf_init_path(tied_file_name,
+                is a tied file  */
+            dres = dwarf_init_path_a(tied_file_name,
                 0,0,  /* ignore dSYM & debuglink */
                 DW_GROUPNUMBER_BASE,
+                glflags.gf_universalnumber,
                 0,0,
                 &dbgtied,
                 &onef_err);