Print this page
7319 Need a way to turn off ld "multiple inclusion" warnings
Reviewed by: Martin Bochnig <opensxce@mail.ru>
Reviewed by: Kim Shrier <kshrier@racktopsystems.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/sgs/libld/common/args.c
          +++ new/usr/src/cmd/sgs/libld/common/args.c
↓ open down ↓ 19 lines elided ↑ open up ↑
  20   20   */
  21   21  
  22   22  /*
  23   23   *      Copyright (c) 1988 AT&T
  24   24   *        All Rights Reserved
  25   25   *
  26   26   * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  27   27   */
  28   28  /*
  29   29   * Copyright (c) 2012, Joyent, Inc.  All rights reserved.
       30 + * Copyright 2016 RackTop Systems.
  30   31   */
  31   32  
  32   33  /*
  33   34   * Publicly available flags are defined in ld(1).   The following flags are
  34   35   * private, and may be removed at any time.
  35   36   *
  36   37   *    OPTION                    MEANING
  37   38   *
  38   39   *    -z dtrace=symbol          assigns symbol to PT_SUNWDTRACE segment,
  39   40   *                              providing scratch area for dtrace processing.
↓ open down ↓ 158 lines elided ↑ open up ↑
 198  199          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZH));
 199  200          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZIG));
 200  201          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZINA));
 201  202          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZINI));
 202  203          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZINT));
 203  204          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZLAZY));
 204  205          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZLD32));
 205  206          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZLD64));
 206  207          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZLO));
 207  208          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZM));
      209 +        (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZMI));
 208  210          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNC));
 209  211          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNDFS));
 210  212          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNDEF));
 211  213          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNDEL));
 212  214          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNDLO));
 213  215          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNDU));
 214  216          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNLD));
 215  217          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNOW));
 216  218          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNPA));
 217  219          (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZNV));
↓ open down ↓ 1100 lines elided ↑ open up ↑
1318 1320                                  zlflag = TRUE;
1319 1321                          } else if (strcmp(optarg,
1320 1322                              MSG_ORIG(MSG_ARG_NORELOC)) == 0) {
1321 1323                                  ofl->ofl_dtflags_1 |= DF_1_NORELOC;
1322 1324                          } else if (strcmp(optarg,
1323 1325                              MSG_ORIG(MSG_ARG_NOVERSION)) == 0) {
1324 1326                                  ofl->ofl_flags |= FLG_OF_NOVERSEC;
1325 1327                          } else if (strcmp(optarg,
1326 1328                              MSG_ORIG(MSG_ARG_MULDEFS)) == 0) {
1327 1329                                  ofl->ofl_flags |= FLG_OF_MULDEFS;
     1330 +                        } else if (strcmp(optarg,
     1331 +                            MSG_ORIG(MSG_ARG_MULINCL)) == 0) {
     1332 +                                ofl->ofl_flags |= FLG_OF_MULINCL;
1328 1333                          } else if (strcmp(optarg,
1329 1334                              MSG_ORIG(MSG_ARG_REDLOCSYM)) == 0) {
1330 1335                                  ofl->ofl_flags |= FLG_OF_REDLSYM;
1331 1336                          } else if (strcmp(optarg,
1332 1337                              MSG_ORIG(MSG_ARG_INITFIRST)) == 0) {
1333 1338                                  ofl->ofl_dtflags_1 |= DF_1_INITFIRST;
1334 1339                          } else if (strcmp(optarg,
1335 1340                              MSG_ORIG(MSG_ARG_NODELETE)) == 0) {
1336 1341                                  ofl->ofl_dtflags_1 |= DF_1_NODELETE;
1337 1342                          } else if (strcmp(optarg,
↓ open down ↓ 808 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX