darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-30 07:40:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8217910: Slow linking with devkit on Linux

Browse Source 
Reviewed-by: redestad, ehelin, ihse
This commit is contained in:
Erik Joelsson 2019-01-29 10:09:13 -08:00
parent 82d39621dc
commit 89e28292d2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
make/conf/jib-profiles.js
View File

@ -861,13 +861,13 @@ var getJibProfilesProfiles = function (input, common, data) {
var getJibProfilesDependencies = function (input, common) {
var devkit_platform_revisions = {
linux_x64: "gcc7.3.0-OEL6.4+1.1",
linux_x64: "gcc7.3.0-OEL6.4+1.2",
macosx_x64: "Xcode9.4-MacOSX10.13+1.0",
solaris_x64: "SS12u4-Solaris11u1+1.0",
solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
windows_x64: "VS2017-15.5.5+1.0",
linux_aarch64: "gcc7.3.0-Fedora27+1.1",
linux_arm: "gcc7.3.0-Fedora27+1.1"
linux_aarch64: "gcc7.3.0-Fedora27+1.2",
linux_arm: "gcc7.3.0-Fedora27+1.2"
};
var devkit_platform = (input.target_cpu == "x86"

6
make/devkit/Tools.gmk
View File

@ -103,7 +103,7 @@ endif
GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.xz
BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.xz
CCACHE := https://samba.org/ftp/ccache/$(ccache_ver).tar.xz
MPFR := http://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
MPFR := https://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
MPC := http://ftp.gnu.org/pub/gnu/mpc/${mpc_ver}.tar.gz
GDB := http://ftp.gnu.org/gnu/gdb/${gdb_ver}.tar.xz
@ -355,6 +355,7 @@ $(gcc) \
$(BUILDDIR)/$(binutils_ver)/Makefile : CONFIG += --enable-64-bit-bfd --libdir=$(PREFIX)/$(word 1,$(LIBDIRS))
# Makefile creation. Simply run configure in build dir.
# Setting CFLAGS to -O2 generates a much faster ld.
$(bfdmakes) \
$(BUILDDIR)/$(binutils_ver)/Makefile \
: $(BINUTILS_CFG)
@ -362,7 +363,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \
@mkdir -p $(@D)
( \
cd $(@D) ; \
$(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
$(PATHPRE) $(ENVS) CFLAGS="-O2 $(CFLAGS)" \
$(BINUTILS_CFG) \
$(CONFIG) \
--with-sysroot=$(SYSROOT) \
@ -370,6 +371,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \
--program-prefix=$(TARGET)- \
--enable-multilib \
--enable-gold \
--enable-threads \
--enable-plugins \
) > $(@D)/log.config 2>&1
@echo 'done'