wip/grub2-current/patches/patch-configure-LDFLAGS_AC

   1 --- acinclude.m4.orig   2009-12-30 22:05:08.000000000 +0100
   2 +++ acinclude.m4        2009-12-30 21:56:05.000000000 +0100
   3 @@ -93,7 +93,7 @@
   4  fi
   5  grub_cv_prog_objcopy_absolute=yes
   6  for link_addr in 0x2000 0x8000 0x7C00; do
   7 -  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC} -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then :
   8 +  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC}$link_addr conftest.o -o conftest.exec]); then :
   9    else
  10      AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
  11    fi
  12 --- configure.ac.orig   2009-12-30 22:34:06.000000000 +0100
  13 +++ configure.ac        2009-12-30 22:37:04.000000000 +0100
  14 @@ -311,7 +311,7 @@
  15  if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
  16    TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
  17    TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}  -Wl,-Ttext,"
  18 -  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
  19 +  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
  20  else
  21    TARGET_IMG_LDSCRIPT=
  22    TARGET_IMG_LDFLAGS='-Wl,-N  -Wl,-Ttext,'
  23 @@ -446,7 +446,7 @@
  24  if test "x$target_cpu" = xi386; then
  25    if test ! -z "$TARGET_IMG_LDSCRIPT"; then
  26      # Check symbols provided by linker script.
  27 -    CFLAGS="$TARGET_CFLAGS -nostdlib $TARGET_IMG_LDFLAGS_AC -Wl,-Ttext,8000,--defsym,___main=0x8100"
  28 +    CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000,--defsym,___main=0x8100"
  29    fi
  30    if test "x$TARGET_APPLE_CC" != x1 ; then
  31      grub_CHECK_BSS_START_SYMBOL