Print this page
fix gld to use 32bit only if we are using gld 64bit

Split Close
Expand all
Collapse all
          --- old/usr/src/grub/grub-0.97/stage2/Makefile.solaris
          +++ new/usr/src/grub/grub-0.97/stage2/Makefile.solaris
↓ open down ↓ 34 lines elided ↑ open up ↑
  35   35                    -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1
  36   36  $(OPTION_FS)GRUB_CFLAGS += -DFSYS_MINIX=1 -DFSYS_JFS=1 -DFSYS_XFS=1 \
  37   37                    -DSYS_VSTAFS=1
  38   38  # GRUB_CFLAGS   += -DSUPPORT_HERCULES=1
  39   39  STAGE1_5_CFLAGS = $(STAGE2_CFLAGS) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
  40   40  STAGE2_CFLAGS   = -Os -fno-builtin -nostdinc \
  41   41                    $(SERIAL_CFLAGS) $(GRAPHICS_CFLAGS)
  42   42  $(STAGE2_NETBOOT)STAGE2_CFLAGS  += $(NETBOOT_CFLAGS)
  43   43  #STAGE2_CFLAGS  += $(HERCULES_CFLAGS)
  44   44  
  45      -NBLOADER_LINK   = -nostdlib -N -Ttext 0
  46      -PRE_STAGE2_LINK = -nostdlib -N -Ttext 8200
  47      -PXELOADER_LINK  = -nostdlib -N -Ttext 7C00
  48      -STAGE1_5_LINK   = -nostdlib -N -Ttext 2000
  49      -START_ELTORITO_LINK = -nostdlib -N -Ttext 7C00
  50      -START_LINK      = -nostdlib -N -Ttext 8000
       45 +NBLOADER_LINK   = -m elf_i386_sol2 -nostdlib -N -Ttext 0
       46 +PRE_STAGE2_LINK = -m elf_i386_sol2 -nostdlib -N -Ttext 8200
       47 +PXELOADER_LINK  = -m elf_i386_sol2 -nostdlib -N -Ttext 7C00
       48 +STAGE1_5_LINK   = -m elf_i386_sol2 -nostdlib -N -Ttext 2000
       49 +START_ELTORITO_LINK = -m elf_i386_sol2 -nostdlib -N -Ttext 7C00
       50 +START_LINK      = -m elf_i386_sol2 -nostdlib -N -Ttext 8000
  51   51  
  52   52  LIBDRIVERS      = ../netboot/libdrivers.a
  53   53  
  54   54  
  55   55  BUILT_SOURCES   = stage2_size.h
  56   56  BUILT_SOURCES   += diskless_size.h
  57   57  
  58   58  
  59   59  LIBRARIES       = $(LIBGRUB)
  60   60  
↓ open down ↓ 888 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX