Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 May 2015 14:05:20 +0000
From:      "emaste (Ed Maste)" <phabric-noreply@FreeBSD.org>
To:        freebsd-toolchain@freebsd.org
Subject:   [Differential] [Closed] D2576: Update crunch bootstrapping test
Message-ID:  <11c0b950d97a880750add419f113dda5@localhost.localdomain>
In-Reply-To: <differential-rev-PHID-DREV-rkhkqace4gzhir6de4rj-req@FreeBSD.org>
References:  <differential-rev-PHID-DREV-rkhkqace4gzhir6de4rj-req@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help

[-- Attachment #1 --]
This revision was automatically updated to reflect the committed changes.
Closed by commit rS283108: Update crunch bootstrapping test for recent fixes (authored by emaste).

CHANGED PRIOR TO COMMIT
  https://reviews.freebsd.org/D2576?vs=5456&id=5476#toc

REPOSITORY
  rS FreeBSD src repository

REVISION DETAIL
  https://reviews.freebsd.org/D2576

AFFECTED FILES
  head/Makefile.inc1

CHANGE DETAILS
  diff --git a/head/Makefile.inc1 b/head/Makefile.inc1
  --- a/head/Makefile.inc1
  +++ b/head/Makefile.inc1
  @@ -1297,7 +1297,9 @@
   _lex=		usr.bin/lex
   .endif
   
  -.if ${BOOTSTRAPPING} < 1001507
  +# r277259 crunchide: Correct 64-bit section header offset
  +# r281674 crunchide: always include both 32- and 64-bit ELF support
  +.if ${BOOTSTRAPPING} < 1100071
   _crunch=	usr.sbin/crunch
   .endif
   
  @@ -1466,11 +1468,6 @@
   _btxld=		usr.sbin/btxld
   .endif
   .endif
  -.if ${TARGET_ARCH} != ${MACHINE_ARCH}
  -.if ${MK_RESCUE} != "no"
  -_crunchide=	usr.sbin/crunch/crunchide
  -.endif
  -.endif
   
   # If we're given an XAS, don't build binutils.
   .if ${XAS:M/*} == ""

EMAIL PREFERENCES
  https://reviews.freebsd.org/settings/panel/emailpreferences/

To: emaste, imp
Cc: freebsd-toolchain

[-- Attachment #2 --]
diff --git a/head/Makefile.inc1 b/head/Makefile.inc1
--- a/head/Makefile.inc1
+++ b/head/Makefile.inc1
@@ -1297,7 +1297,9 @@
 _lex=		usr.bin/lex
 .endif
 
-.if ${BOOTSTRAPPING} < 1001507
+# r277259 crunchide: Correct 64-bit section header offset
+# r281674 crunchide: always include both 32- and 64-bit ELF support
+.if ${BOOTSTRAPPING} < 1100071
 _crunch=	usr.sbin/crunch
 .endif
 
@@ -1466,11 +1468,6 @@
 _btxld=		usr.sbin/btxld
 .endif
 .endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
-.if ${MK_RESCUE} != "no"
-_crunchide=	usr.sbin/crunch/crunchide
-.endif
-.endif
 
 # If we're given an XAS, don't build binutils.
 .if ${XAS:M/*} == ""


Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?11c0b950d97a880750add419f113dda5>