grub-legacy-gfx/grub-0.97-ldflags-objcopy-remove-build-id.patch

   1 diff --git a/Makefile.in b/Makefile.in
   2 index 6652366..ba058eb 100644
   3 --- a/Makefile.in
   4 +++ b/Makefile.in
   5 @@ -112,6 +112,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
   6  LDFLAGS = @LDFLAGS@
   7  LIBOBJS = @LIBOBJS@
   8  LIBS = @LIBS@
   9 +LOADER_LDFLAGS = @LOADER_LDFLAGS@
  10  LTLIBOBJS = @LTLIBOBJS@
  11  MAINT = @MAINT@
  12  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
  13 diff --git a/acinclude.m4 b/acinclude.m4
  14 index 368839c..32b3fa6 100644
  15 --- a/acinclude.m4
  16 +++ b/acinclude.m4
  17 @@ -57,7 +57,7 @@ else
  18  fi
  19  grub_cv_prog_objcopy_absolute=yes
  20  for link_addr in 2000 8000 7C00; do
  21 -  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then :
  22 +  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr -Wl,--build-id=none conftest.o -o conftest.exec]); then :
  23    else
  24      AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
  25    fi
  26 diff --git a/configure.ac b/configure.ac
  27 index bb9e1d9..9ac5c9f 100644
  28 --- a/configure.ac
  29 +++ b/configure.ac
  30 @@ -115,6 +115,9 @@ if test "x$ac_cv_prog_gcc" = xyes; then
  31    fi
  32  fi
  33
  34 +LOADER_LDFLAGS="-Wl,--build-id=none"
  35 +AC_SUBST(LOADER_LDFLAGS)
  36 +
  37  AC_SUBST(STAGE1_CFLAGS)
  38  AC_SUBST(STAGE2_CFLAGS)
  39  AC_SUBST(GRUB_CFLAGS)
  40 diff --git a/docs/Makefile.in b/docs/Makefile.in
  41 index 3e2de4b..7b2c94d 100644
  42 --- a/docs/Makefile.in
  43 +++ b/docs/Makefile.in
  44 @@ -131,6 +131,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  45  LDFLAGS = @LDFLAGS@
  46  LIBOBJS = @LIBOBJS@
  47  LIBS = @LIBS@
  48 +LOADER_LDFLAGS = @LOADER_LDFLAGS@
  49  LTLIBOBJS = @LTLIBOBJS@
  50  MAINT = @MAINT@
  51  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
  52 diff --git a/grub/Makefile.in b/grub/Makefile.in
  53 index 136c38f..7c23ebe 100644
  54 --- a/grub/Makefile.in
  55 +++ b/grub/Makefile.in
  56 @@ -108,6 +108,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  57  LDFLAGS = @LDFLAGS@
  58  LIBOBJS = @LIBOBJS@
  59  LIBS = @LIBS@
  60 +LOADER_LDFLAGS = @LOADER_LDFLAGS@
  61  LTLIBOBJS = @LTLIBOBJS@
  62  MAINT = @MAINT@
  63  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
  64 diff --git a/lib/Makefile.in b/lib/Makefile.in
  65 index 3dae206..449e126 100644
  66 --- a/lib/Makefile.in
  67 +++ b/lib/Makefile.in
  68 @@ -107,6 +107,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  69  LDFLAGS = @LDFLAGS@
  70  LIBOBJS = @LIBOBJS@
  71  LIBS = @LIBS@
  72 +LOADER_LDFLAGS = @LOADER_LDFLAGS@
  73  LTLIBOBJS = @LTLIBOBJS@
  74  MAINT = @MAINT@
  75  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
  76 diff --git a/netboot/Makefile.in b/netboot/Makefile.in
  77 index 75ac299..0275768 100644
  78 --- a/netboot/Makefile.in
  79 +++ b/netboot/Makefile.in
  80 @@ -108,6 +108,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  81  LDFLAGS = @LDFLAGS@
  82  LIBOBJS = @LIBOBJS@
  83  LIBS = @LIBS@
  84 +LOADER_LDFLAGS = @LOADER_LDFLAGS@
  85  LTLIBOBJS = @LTLIBOBJS@
  86  MAINT = @MAINT@
  87  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
  88 diff --git a/stage1/Makefile.am b/stage1/Makefile.am
  89 index 0afc285..3d83356 100644
  90 --- a/stage1/Makefile.am
  91 +++ b/stage1/Makefile.am
  92 @@ -5,7 +5,7 @@ CLEANFILES = $(nodist_pkglib_DATA)
  93
  94  # We can't use builtins or standard includes.
  95  AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
  96 -LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
  97 +LDFLAGS = $(LOADER_LDFLAGS) -nostdlib -Wl,-N,-Ttext,7C00
  98
  99  noinst_PROGRAMS = stage1.exec
 100  stage1_exec_SOURCES = stage1.S stage1.h
 101 diff --git a/stage1/Makefile.in b/stage1/Makefile.in
 102 index 7134bdf..ee4477f 100644
 103 --- a/stage1/Makefile.in
 104 +++ b/stage1/Makefile.in
 105 @@ -110,9 +110,10 @@ INSTALL_DATA = @INSTALL_DATA@
 106  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 107  INSTALL_SCRIPT = @INSTALL_SCRIPT@
 108  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 109 -LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
 110 +LDFLAGS = $(LOADER_LDFLAGS) -nostdlib -Wl,-N,-Ttext,7C00
 111  LIBOBJS = @LIBOBJS@
 112  LIBS = @LIBS@
 113 +LOADER_LDFLAGS = @LOADER_LDFLAGS@
 114  LTLIBOBJS = @LTLIBOBJS@
 115  MAINT = @MAINT@
 116  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 117 diff --git a/stage2/Makefile.am b/stage2/Makefile.am
 118 index f8e6d42..ff6f347 100644
 119 --- a/stage2/Makefile.am
 120 +++ b/stage2/Makefile.am
 121 @@ -55,11 +55,11 @@ noinst_PROGRAMS = pre_stage2.exec start.exec start_eltorito.exec \
 122  endif
 123  MOSTLYCLEANFILES = $(noinst_PROGRAMS)
 124
 125 -PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200
 126 -START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
 127 -NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0
 128 -PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
 129 -START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
 130 +PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200 $(LOADER_LDFLAGS)
 131 +START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000 $(LOADER_LDFLAGS)
 132 +NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0 $(LOADER_LDFLAGS)
 133 +PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
 134 +START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
 135
 136  if NETBOOT_SUPPORT
 137  NETBOOT_FLAGS = -I$(top_srcdir)/netboot -DSUPPORT_NETBOOT=1
 138 @@ -82,7 +82,7 @@ endif
 139  STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
 140         $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
 141
 142 -STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
 143 +STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000 $(LOADER_LDFLAGS)
 144  STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
 145
 146  # For stage2 target.
 147 diff --git a/stage2/Makefile.in b/stage2/Makefile.in
 148 index d0062bd..88b2038 100644
 149 --- a/stage2/Makefile.in
 150 +++ b/stage2/Makefile.in
 151 @@ -355,6 +355,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 152  LDFLAGS = @LDFLAGS@
 153  LIBOBJS = @LIBOBJS@
 154  LIBS = @LIBS@
 155 +LOADER_LDFLAGS = @LOADER_LDFLAGS@
 156  LTLIBOBJS = @LTLIBOBJS@
 157  MAINT = @MAINT@
 158  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 159 @@ -468,11 +469,11 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
 160  @DISKLESS_SUPPORT_FALSE@noinst_DATA = pre_stage2 start start_eltorito
 161  @DISKLESS_SUPPORT_TRUE@noinst_DATA = pre_stage2 start start_eltorito nbloader pxeloader diskless
 162  MOSTLYCLEANFILES = $(noinst_PROGRAMS)
 163 -PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200
 164 -START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
 165 -NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0
 166 -PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
 167 -START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
 168 +PRE_STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8200 $(LOADER_LDFLAGS)
 169 +START_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000 $(LOADER_LDFLAGS)
 170 +NBLOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,0 $(LOADER_LDFLAGS)
 171 +PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
 172 +START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00 $(LOADER_LDFLAGS)
 173  @NETBOOT_SUPPORT_FALSE@NETBOOT_FLAGS =
 174  @NETBOOT_SUPPORT_TRUE@NETBOOT_FLAGS = -I$(top_srcdir)/netboot -DSUPPORT_NETBOOT=1
 175  @SERIAL_SUPPORT_FALSE@SERIAL_FLAGS =
 176 @@ -482,7 +483,7 @@ START_ELTORITO_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,7C00
 177  STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
 178         $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
 179
 180 -STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
 181 +STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000 $(LOADER_LDFLAGS)
 182  STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
 183
 184  # For stage2 target.
 185 diff --git a/util/Makefile.in b/util/Makefile.in
 186 index e700cf7..cd3bf51 100644
 187 --- a/util/Makefile.in
 188 +++ b/util/Makefile.in
 189 @@ -113,6 +113,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 190  LDFLAGS = @LDFLAGS@
 191  LIBOBJS = @LIBOBJS@
 192  LIBS = @LIBS@
 193 +LOADER_LDFLAGS = @LOADER_LDFLAGS@
 194  LTLIBOBJS = @LTLIBOBJS@
 195  MAINT = @MAINT@
 196  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@