diff options
| author | gjb <gjb@FreeBSD.org> | 2017-07-20 23:39:50 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-07-20 23:39:50 +0000 |
| commit | 2f4b735c66deb54490042a818e8fd26fa46818f1 (patch) | |
| tree | 42f53c01e08a46d5fd20f6e9ce1e503aeaf7f59d | |
| parent | afdfbcbc1a829fbbe225d20195247044609ffab6 (diff) | |
| download | FreeBSD-src-2f4b735c66deb54490042a818e8fd26fa46818f1.zip FreeBSD-src-2f4b735c66deb54490042a818e8fd26fa46818f1.tar.gz | |
- Switch releng/11.1 to -RELEASE.
- Add the anticipated 11.1-RELEASE date to UPDATING.
- Set a static __FreeBSD_version.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | lib/csu/common/crtbrand.c | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20170725: + 11.1-RELEASE. + 20170518: arm64 builds now use the base system LLD 4.0.0 linker by default, instead of requiring that the aarch64-binutils port or package be diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c index 04df686..d15aaf1 100644 --- a/lib/csu/common/crtbrand.c +++ b/lib/csu/common/crtbrand.c @@ -62,5 +62,5 @@ static const struct { .descsz = sizeof(int32_t), .type = ABI_NOTETYPE, .name = NOTE_FREEBSD_VENDOR, - .desc = __FreeBSD_version + .desc = 1101001 }; diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 7c51f9d..ec9e129 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.1" -BRANCH="RC3" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi |
