Print this page
Cstyle cleanup

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/sgs/libconv/Makefile.com
          +++ new/usr/src/cmd/sgs/libconv/Makefile.com
↓ open down ↓ 19 lines elided ↑ open up ↑
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright 2018, Joyent, Inc.
  25   25  #
  26   26  
  27   27  LIBRARY =       libconv.a
  28   28  
  29   29  COMOBJS32 =     cap_machelf32.o         dynamic_machelf32.o \
  30      -                globals_machelf32.o     sections_machelf32.o \
       30 +                globals_machelf32.o     sections_machelf32.o \
  31   31                  symbols_machelf32.o     symbols_sparc_machelf32.o
  32   32  
  33   33  COMOBJS64 =     cap_machelf64.o         dynamic_machelf64.o \
  34   34                  globals_machelf64.o     sections_machelf64.o \
  35   35                  symbols_machelf64.o     symbols_sparc_machelf64.o
  36   36  
  37   37  COMOBJS=        arch.o                  audit.o \
  38   38                  c_literal.o \
  39   39                  cap.o                   config.o \
  40      -                corenote.o              data.o \
  41      -                deftag.o                demangle.o \
       40 +                corenote.o              data.o \
       41 +                deftag.o                demangle.o \
  42   42                  dl.o                    dwarf.o \
  43      -                dwarf_ehe.o             dynamic.o \
       43 +                dwarf_ehe.o             dynamic.o \
  44   44                  elf.o                   entry.o \
  45   45                  globals.o               group.o \
  46      -                lddstub.o               map.o \
       46 +                lddstub.o               map.o \
  47   47                  phdr.o                  relocate.o \
  48      -                relocate_i386.o         relocate_amd64.o \
       48 +                relocate_i386.o         relocate_amd64.o \
  49   49                  relocate_sparc.o        sections.o \
  50      -                segments.o              strproc.o \
  51      -                symbols.o               syminfo.o \
  52      -                tokens.o                time.o \
       50 +                segments.o              strproc.o \
       51 +                symbols.o               syminfo.o \
       52 +                tokens.o                time.o \
  53   53                  version.o
  54   54  
  55   55  ELFCAP_OBJS=    elfcap.o
  56   56  
  57   57  ASOBJS=         vernote.o
  58   58  
  59   59  BLTOBJS=        arch_msg.o              audit_msg.o \
  60   60                  c_literal_msg.o \
  61   61                  cap_msg.o               config_msg.o \
  62   62                  corenote_msg.o          data_msg.o \
  63   63                  deftag_msg.o            demangle_msg.o \
  64   64                  dl_msg.o                dwarf_msg.o \
  65      -                dwarf_ehe_msg.o         dynamic_msg.o \
  66      -                elf_msg.o               entry_msg.o \
       65 +                dwarf_ehe_msg.o         dynamic_msg.o \
       66 +                elf_msg.o               entry_msg.o \
  67   67                  globals_msg.o           group_msg.o \
  68      -                map_msg.o               lddstub_msg.o \
  69      -                phdr_msg.o              relocate_amd64_msg.o \
       68 +                map_msg.o               lddstub_msg.o \
       69 +                phdr_msg.o              relocate_amd64_msg.o \
  70   70                  relocate_i386_msg.o     relocate_sparc_msg.o \
  71      -                sections_msg.o          segments_msg.o \
  72      -                symbols_msg.o           symbols_sparc_msg.o \
  73      -                syminfo_msg.o           time_msg.o \
       71 +                sections_msg.o          segments_msg.o \
       72 +                symbols_msg.o           symbols_sparc_msg.o \
       73 +                syminfo_msg.o           time_msg.o \
  74   74                  version_msg.o
  75   75  
  76   76  
  77   77  OBJECTS =       $(COMOBJS) $(COMOBJS32) $(COMOBJS64) $(ELFCAP_OBJS) \
  78   78                  $(ASOBJS) $(BLTOBJS)
  79   79  
  80   80  #
  81   81  # This library is unusual since it's a static archive of PIC objects.
  82   82  # Since static archives should never contain CTF data (regardless of
  83   83  # whether the object code is position-independent), we disable CTF.
  84   84  #
  85   85  NOCTFOBJS =     $(OBJECTS)
  86   86  CTFMERGE_LIB =  :
  87   87  
  88      -include         $(SRC)/lib/Makefile.lib
  89      -include         $(SRC)/cmd/sgs/Makefile.com
       88 +include $(SRC)/lib/Makefile.lib
       89 +include $(SRC)/cmd/sgs/Makefile.com
  90   90  
  91   91  CERRWARN        += -_gcc=-Wno-type-limits
  92   92  CERRWARN        += -_gcc=-Wno-switch
  93   93  
  94   94  CTFCONVERT_O=
  95   95  
  96   96  README_REVISION=../../packages/common/readme_revision
  97   97  ONLDREADME=     ../../packages/common/SUNWonld-README
  98   98  
  99   99  PICS=           $(OBJECTS:%=pics/%)
↓ open down ↓ 32 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX