Merge branch 'toolchain' into next

2026-04-17 14:33:00 +02:00 · 2018-10-29 10:51:00 +00:00
parent aba59b7c76 9040a476cc
commit 65ff71dc06
10 changed files with 87 additions and 60 deletions
--- a/config/rootfiles/common/aarch64/glibc
+++ b/config/rootfiles/common/aarch64/glibc
@@ -8379,24 +8379,3 @@ usr/lib/locale
 #var/cache/ldconfig/aux-cache
 #var/db
 #var/db/Makefile
-lib/ld-2.27.so
-lib/libBrokenLocale-2.27.so
-lib/libanl-2.27.so
-lib/libc-2.27.so
-lib/libcidn-2.27.so
-lib/libcidn.so.1
-lib/libcrypt-2.27.so
-lib/libdl-2.27.so
-lib/libm-2.27.so
-lib/libnsl-2.27.so
-lib/libnss_compat-2.27.so
-lib/libnss_db-2.27.so
-lib/libnss_dns-2.27.so
-lib/libnss_files-2.27.so
-lib/libnss_hesiod-2.27.so
-lib/libnss_nis-2.27.so
-lib/libnss_nisplus-2.27.so
-lib/libpthread-2.27.so
-lib/libresolv-2.27.so
-lib/librt-2.27.so
-lib/libutil-2.27.so
--- a/config/rootfiles/common/e2fsprogs
+++ b/config/rootfiles/common/e2fsprogs
@@ -144,5 +144,3 @@ usr/sbin/uuidd
 #usr/share/ss
 #usr/share/ss/ct_c.awk
 #usr/share/ss/ct_c.sed
-sbin/fsck.ext4dev
-sbin/mkfs.ext4dev
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -1,49 +1,47 @@
 #etc/ld.so.cache
 etc/rpc
-lib/ld-2.27.so
+lib/ld-2.28.so
 lib/ld-linux.so.2
-lib/libBrokenLocale-2.27.so
+lib/libBrokenLocale-2.28.so
 lib/libBrokenLocale.so.1
 #lib/libSegFault.so
-lib/libanl-2.27.so
+lib/libanl-2.28.so
 lib/libanl.so.1
-lib/libc-2.27.so
+lib/libc-2.28.so
 lib/libc.so.6
-lib/libcidn-2.27.so
-lib/libcidn.so.1
-lib/libcrypt-2.27.so
+lib/libcrypt-2.28.so
 lib/libcrypt.so.1
-lib/libdl-2.27.so
+lib/libdl-2.28.so
 lib/libdl.so.2
-lib/libm-2.27.so
+lib/libm-2.28.so
 lib/libm.so.6
 #lib/libmemusage.so
-lib/libnsl-2.27.so
+lib/libnsl-2.28.so
 lib/libnsl.so.1
-lib/libnss_compat-2.27.so
+lib/libnss_compat-2.28.so
 lib/libnss_compat.so.2
-lib/libnss_db-2.27.so
+lib/libnss_db-2.28.so
 lib/libnss_db.so.2
-lib/libnss_dns-2.27.so
+lib/libnss_dns-2.28.so
 lib/libnss_dns.so.2
-lib/libnss_files-2.27.so
+lib/libnss_files-2.28.so
 lib/libnss_files.so.2
-lib/libnss_hesiod-2.27.so
+lib/libnss_hesiod-2.28.so
 lib/libnss_hesiod.so.2
-lib/libnss_nis-2.27.so
+lib/libnss_nis-2.28.so
 lib/libnss_nis.so.2
-lib/libnss_nisplus-2.27.so
+lib/libnss_nisplus-2.28.so
 lib/libnss_nisplus.so.2
 #lib/libpcprofile.so
-lib/libpthread-2.27.so
+lib/libpthread-2.28.so
 lib/libpthread.so.0
-lib/libresolv-2.27.so
+lib/libresolv-2.28.so
 lib/libresolv.so.2
-lib/librt-2.27.so
+lib/librt-2.28.so
 lib/librt.so.1
 lib/libthread_db-1.0.so
 lib/libthread_db.so.1
-lib/libutil-2.27.so
+lib/libutil-2.28.so
 lib/libutil.so.1
 sbin/ldconfig
 #sbin/sln
@@ -65,7 +63,6 @@ usr/bin/locale
 #usr/bin/sprof
 #usr/bin/tzselect
 #usr/bin/xtrace
-#usr/include/_G_config.h
 #usr/include/a.out.h
 #usr/include/aio.h
 #usr/include/aliases.h
@@ -82,9 +79,7 @@ usr/bin/locale
 #usr/include/arpa/tftp.h
 #usr/include/assert.h
 #usr/include/bits
-#usr/include/bits/_G_config.h
 #usr/include/bits/a.out.h
-#usr/include/bits/byteswap-16.h
 #usr/include/bits/byteswap.h
 #usr/include/bits/cmathcalls.h
 #usr/include/bits/confname.h
@@ -113,6 +108,7 @@ usr/bin/locale
 #usr/include/bits/getopt_posix.h
 #usr/include/bits/hwcap.h
 #usr/include/bits/in.h
+#usr/include/bits/indirect-return.h
 #usr/include/bits/initspin.h
 #usr/include/bits/inotify.h
 #usr/include/bits/ioctl-types.h
@@ -121,8 +117,6 @@ usr/bin/locale
 #usr/include/bits/ipctypes.h
 #usr/include/bits/iscanonical.h
 #usr/include/bits/libc-header-start.h
-#usr/include/bits/libio-ldbl.h
-#usr/include/bits/libio.h
 #usr/include/bits/libm-simd-decl-stubs.h
 #usr/include/bits/link.h
 #usr/include/bits/local_lim.h
@@ -131,6 +125,7 @@ usr/bin/locale
 #usr/include/bits/math-finite.h
 #usr/include/bits/math-vector.h
 #usr/include/bits/mathcalls-helper-functions.h
+#usr/include/bits/mathcalls-narrow.h
 #usr/include/bits/mathcalls.h
 #usr/include/bits/mathdef.h
 #usr/include/bits/mathinline.h
@@ -181,6 +176,7 @@ usr/bin/locale
 #usr/include/bits/stat.h
 #usr/include/bits/statfs.h
 #usr/include/bits/statvfs.h
+#usr/include/bits/statx.h
 #usr/include/bits/stdint-intn.h
 #usr/include/bits/stdint-uintn.h
 #usr/include/bits/stdio-ldbl.h
@@ -210,12 +206,16 @@ usr/bin/locale
 #usr/include/bits/types.h
 #usr/include/bits/types/FILE.h
 #usr/include/bits/types/__FILE.h
+#usr/include/bits/types/__fpos64_t.h
+#usr/include/bits/types/__fpos_t.h
 #usr/include/bits/types/__locale_t.h
 #usr/include/bits/types/__mbstate_t.h
 #usr/include/bits/types/__sigset_t.h
 #usr/include/bits/types/__sigval_t.h
 #usr/include/bits/types/clock_t.h
 #usr/include/bits/types/clockid_t.h
+#usr/include/bits/types/cookie_io_functions_t.h
+#usr/include/bits/types/error_t.h
 #usr/include/bits/types/locale_t.h
 #usr/include/bits/types/mbstate_t.h
 #usr/include/bits/types/res_state.h
@@ -225,10 +225,12 @@ usr/bin/locale
 #usr/include/bits/types/sigset_t.h
 #usr/include/bits/types/sigval_t.h
 #usr/include/bits/types/stack_t.h
+#usr/include/bits/types/struct_FILE.h
 #usr/include/bits/types/struct_iovec.h
 #usr/include/bits/types/struct_itimerspec.h
 #usr/include/bits/types/struct_osockaddr.h
 #usr/include/bits/types/struct_rusage.h
+#usr/include/bits/types/struct_sched_param.h
 #usr/include/bits/types/struct_sigstack.h
 #usr/include/bits/types/struct_timespec.h
 #usr/include/bits/types/struct_timeval.h
@@ -241,7 +243,6 @@ usr/bin/locale
 #usr/include/bits/uio-ext.h
 #usr/include/bits/uio_lim.h
 #usr/include/bits/unistd.h
-#usr/include/bits/ustat.h
 #usr/include/bits/utmp.h
 #usr/include/bits/utmpx.h
 #usr/include/bits/utsname.h
@@ -297,7 +298,6 @@ usr/bin/locale
 #usr/include/lastlog.h
 #usr/include/libgen.h
 #usr/include/libintl.h
-#usr/include/libio.h
 #usr/include/limits.h
 #usr/include/link.h
 #usr/include/locale.h
@@ -378,14 +378,12 @@ usr/bin/locale
 #usr/include/rpc/auth_des.h
 #usr/include/rpc/auth_unix.h
 #usr/include/rpc/clnt.h
-#usr/include/rpc/des_crypt.h
 #usr/include/rpc/key_prot.h
 #usr/include/rpc/netdb.h
 #usr/include/rpc/pmap_clnt.h
 #usr/include/rpc/pmap_prot.h
 #usr/include/rpc/pmap_rmt.h
 #usr/include/rpc/rpc.h
-#usr/include/rpc/rpc_des.h
 #usr/include/rpc/rpc_msg.h
 #usr/include/rpc/svc.h
 #usr/include/rpc/svc_auth.h
@@ -527,7 +525,6 @@ usr/bin/locale
 #usr/include/sys/un.h
 #usr/include/sys/unistd.h
 #usr/include/sys/user.h
-#usr/include/sys/ustat.h
 #usr/include/sys/utsname.h
 #usr/include/sys/vfs.h
 #usr/include/sys/vlimit.h
@@ -544,13 +541,13 @@ usr/bin/locale
 #usr/include/termios.h
 #usr/include/tgmath.h
 #usr/include/thread_db.h
+#usr/include/threads.h
 #usr/include/time.h
 #usr/include/ttyent.h
 #usr/include/uchar.h
 #usr/include/ucontext.h
 #usr/include/ulimit.h
 #usr/include/unistd.h
-#usr/include/ustat.h
 #usr/include/utime.h
 #usr/include/utmp.h
 #usr/include/utmpx.h
@@ -837,7 +834,6 @@ usr/lib/gconv
 #usr/lib/libc.a
 #usr/lib/libc.so
 #usr/lib/libc_nonshared.a
-#usr/lib/libcidn.so
 #usr/lib/libcrypt.a
 #usr/lib/libcrypt.so
 #usr/lib/libdl.a
@@ -857,7 +853,6 @@ usr/lib/gconv
 #usr/lib/libnss_nisplus.so
 #usr/lib/libpthread.a
 #usr/lib/libpthread.so
-#usr/lib/libpthread_nonshared.a
 #usr/lib/libresolv.a
 #usr/lib/libresolv.so
 #usr/lib/librpcsvc.a
@@ -2519,6 +2514,20 @@ usr/lib/locale
 #usr/lib/locale/doi_IN/LC_PAPER
 #usr/lib/locale/doi_IN/LC_TELEPHONE
 #usr/lib/locale/doi_IN/LC_TIME
+#usr/lib/locale/dsb_DE
+#usr/lib/locale/dsb_DE/LC_ADDRESS
+#usr/lib/locale/dsb_DE/LC_COLLATE
+#usr/lib/locale/dsb_DE/LC_CTYPE
+#usr/lib/locale/dsb_DE/LC_IDENTIFICATION
+#usr/lib/locale/dsb_DE/LC_MEASUREMENT
+#usr/lib/locale/dsb_DE/LC_MESSAGES
+#usr/lib/locale/dsb_DE/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/dsb_DE/LC_MONETARY
+#usr/lib/locale/dsb_DE/LC_NAME
+#usr/lib/locale/dsb_DE/LC_NUMERIC
+#usr/lib/locale/dsb_DE/LC_PAPER
+#usr/lib/locale/dsb_DE/LC_TELEPHONE
+#usr/lib/locale/dsb_DE/LC_TIME
 #usr/lib/locale/dv_MV
 #usr/lib/locale/dv_MV/LC_ADDRESS
 #usr/lib/locale/dv_MV/LC_COLLATE
@@ -6215,6 +6224,20 @@ usr/lib/locale
 #usr/lib/locale/sa_IN/LC_PAPER
 #usr/lib/locale/sa_IN/LC_TELEPHONE
 #usr/lib/locale/sa_IN/LC_TIME
+#usr/lib/locale/sah_RU
+#usr/lib/locale/sah_RU/LC_ADDRESS
+#usr/lib/locale/sah_RU/LC_COLLATE
+#usr/lib/locale/sah_RU/LC_CTYPE
+#usr/lib/locale/sah_RU/LC_IDENTIFICATION
+#usr/lib/locale/sah_RU/LC_MEASUREMENT
+#usr/lib/locale/sah_RU/LC_MESSAGES
+#usr/lib/locale/sah_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/sah_RU/LC_MONETARY
+#usr/lib/locale/sah_RU/LC_NAME
+#usr/lib/locale/sah_RU/LC_NUMERIC
+#usr/lib/locale/sah_RU/LC_PAPER
+#usr/lib/locale/sah_RU/LC_TELEPHONE
+#usr/lib/locale/sah_RU/LC_TIME
 #usr/lib/locale/sat_IN
 #usr/lib/locale/sat_IN/LC_ADDRESS
 #usr/lib/locale/sat_IN/LC_COLLATE
@@ -7965,6 +7988,7 @@ usr/lib/locale
 #usr/share/i18n/locales/de_LU
 #usr/share/i18n/locales/de_LU@euro
 #usr/share/i18n/locales/doi_IN
+#usr/share/i18n/locales/dsb_DE
 #usr/share/i18n/locales/dv_MV
 #usr/share/i18n/locales/dz_BT
 #usr/share/i18n/locales/el_CY
@@ -8148,6 +8172,7 @@ usr/lib/locale
 #usr/share/i18n/locales/ru_UA
 #usr/share/i18n/locales/rw_RW
 #usr/share/i18n/locales/sa_IN
+#usr/share/i18n/locales/sah_RU
 #usr/share/i18n/locales/sat_IN
 #usr/share/i18n/locales/sc_IT
 #usr/share/i18n/locales/sd_IN
--- a/config/rootfiles/core/125/filelists/i586/glibc
+++ b/config/rootfiles/core/125/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
--- a/lfs/Config
+++ b/lfs/Config
@@ -37,10 +37,22 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 	IS_64BIT = 1
 endif

+ifeq "$(BUILD_ARCH)" "armv7hl"
+	IS_32BIT = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+	IS_32BIT = 1
+endif
+
 ifeq "$(BUILD_ARCH)" "x86_64"
 	IS_64BIT = 1
 endif

+ifeq "$(BUILD_ARCH)" "i586"
+	IS_32BIT = 1
+endif
+
 ifeq "$(TOOLCHAIN)" "1"
 	PREFIX = $(TOOLS_DIR)
 else
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -50,6 +50,11 @@ CONFIGURE_OPTIONS += \

 CFLAGS += -fno-strict-aliasing

+# Build with 32 bit time_t on 32 bit architectures
+ifeq "$(IS_32BIT)" "1"
+	export TIME_T_32_BIT_OK=yes
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -41,6 +41,11 @@ else
  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
 endif

+# Build with 32 bit time_t on 32 bit architectures
+ifeq "$(IS_32BIT)" "1"
+	export TIME_T_32_BIT_OK=yes
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/libaio
+++ b/lfs/libaio
@@ -73,6 +73,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && sed -e "s@-nostdlib -nostartfiles@@g" -i src/Makefile
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make prefix=/usr install
 	@rm -rf $(DIR_APP)
--- a/lfs/perl
+++ b/lfs/perl
@@ -90,10 +90,11 @@ ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 else
-	cd $(DIR_APP) && ./configure.gnu --prefix=$(TOOLS_DIR) -Dstatic_ext='Data/Dumper Fcntl IO'
+	cd $(DIR_APP) && ./Configure -des -Dprefix=$(TOOLS_DIR) \
+		-Dlibs="-lm" -Uloclibpth -Ulocincpth
 	cd $(DIR_APP) && sed -i 's/^0$$//' makefile
 	cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile
-	cd $(DIR_APP) && make perl utilities
+	cd $(DIR_APP) && make
 	cd $(DIR_APP) && cp -v perl pod/pod2man $(TOOLS_DIR)/bin
 	cd $(DIR_APP) && mkdir -pv $(TOOLS_DIR)/lib/perl5/$(VER)
 	cd $(DIR_APP) && cp -Rv lib/* $(TOOLS_DIR)/lib/perl5/$(VER)
--- a/make.sh
+++ b/make.sh
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit

-TOOLCHAINVER=20180606
+TOOLCHAINVER=20181024

 ###############################################################################
 #