Merge branch 'toolchain' into next

This commit is contained in:
Michael Tremer
2019-05-24 06:55:03 +01:00
12 changed files with 2817 additions and 2751 deletions

View File

@@ -16,7 +16,9 @@ usr/bin/strings
#usr/bin/strip #usr/bin/strip
#usr/include/ansidecl.h #usr/include/ansidecl.h
#usr/include/bfd.h #usr/include/bfd.h
#usr/include/bfd_stdint.h
#usr/include/bfdlink.h #usr/include/bfdlink.h
#usr/include/diagnostics.h
#usr/include/dis-asm.h #usr/include/dis-asm.h
#usr/include/libiberty.h #usr/include/libiberty.h
#usr/include/plugin-api.h #usr/include/plugin-api.h
@@ -286,11 +288,11 @@ usr/bin/strings
#usr/lib/ldscripts/armelfb_linux_eabi.xu #usr/lib/ldscripts/armelfb_linux_eabi.xu
#usr/lib/ldscripts/armelfb_linux_eabi.xw #usr/lib/ldscripts/armelfb_linux_eabi.xw
#usr/lib/ldscripts/armelfb_linux_eabi.xwe #usr/lib/ldscripts/armelfb_linux_eabi.xwe
usr/lib/libbfd-2.30.so usr/lib/libbfd-2.32.so
#usr/lib/libbfd.a #usr/lib/libbfd.a
#usr/lib/libbfd.la #usr/lib/libbfd.la
#usr/lib/libbfd.so #usr/lib/libbfd.so
usr/lib/libopcodes-2.30.so usr/lib/libopcodes-2.32.so
#usr/lib/libopcodes.a #usr/lib/libopcodes.a
#usr/lib/libopcodes.la #usr/lib/libopcodes.la
#usr/lib/libopcodes.so #usr/lib/libopcodes.so
@@ -358,6 +360,10 @@ usr/lib/libopcodes-2.30.so
#usr/share/locale/ms/LC_MESSAGES/gprof.mo #usr/share/locale/ms/LC_MESSAGES/gprof.mo
#usr/share/locale/nl/LC_MESSAGES/gprof.mo #usr/share/locale/nl/LC_MESSAGES/gprof.mo
#usr/share/locale/nl/LC_MESSAGES/opcodes.mo #usr/share/locale/nl/LC_MESSAGES/opcodes.mo
#usr/share/locale/pt
#usr/share/locale/pt/LC_MESSAGES
#usr/share/locale/pt/LC_MESSAGES/bfd.mo
#usr/share/locale/pt/LC_MESSAGES/binutils.mo
#usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo #usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
#usr/share/locale/pt_BR/LC_MESSAGES/ld.mo #usr/share/locale/pt_BR/LC_MESSAGES/ld.mo
#usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo #usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
@@ -422,7 +428,6 @@ usr/lib/libopcodes-2.30.so
#usr/share/man/man1/elfedit.1 #usr/share/man/man1/elfedit.1
#usr/share/man/man1/gprof.1 #usr/share/man/man1/gprof.1
#usr/share/man/man1/ld.1 #usr/share/man/man1/ld.1
#usr/share/man/man1/nlmconv.1
#usr/share/man/man1/nm.1 #usr/share/man/man1/nm.1
#usr/share/man/man1/objcopy.1 #usr/share/man/man1/objcopy.1
#usr/share/man/man1/objdump.1 #usr/share/man/man1/objdump.1

File diff suppressed because it is too large Load Diff

View File

@@ -1,47 +1,47 @@
#etc/ld.so.cache #etc/ld.so.cache
etc/rpc etc/rpc
lib/ld-2.28.so lib/ld-2.29.so
lib/ld-linux-aarch64.so.1 lib/ld-linux-aarch64.so.1
lib/libBrokenLocale-2.28.so lib/libBrokenLocale-2.29.so
lib/libBrokenLocale.so.1 lib/libBrokenLocale.so.1
#lib/libSegFault.so #lib/libSegFault.so
lib/libanl-2.28.so lib/libanl-2.29.so
lib/libanl.so.1 lib/libanl.so.1
lib/libc-2.28.so lib/libc-2.29.so
lib/libc.so.6 lib/libc.so.6
lib/libcrypt-2.28.so lib/libcrypt-2.29.so
lib/libcrypt.so.1 lib/libcrypt.so.1
lib/libdl-2.28.so lib/libdl-2.29.so
lib/libdl.so.2 lib/libdl.so.2
lib/libm-2.28.so lib/libm-2.29.so
lib/libm.so.6 lib/libm.so.6
#lib/libmemusage.so #lib/libmemusage.so
lib/libnsl-2.28.so lib/libnsl-2.29.so
lib/libnsl.so.1 lib/libnsl.so.1
lib/libnss_compat-2.28.so lib/libnss_compat-2.29.so
lib/libnss_compat.so.2 lib/libnss_compat.so.2
lib/libnss_db-2.28.so lib/libnss_db-2.29.so
lib/libnss_db.so.2 lib/libnss_db.so.2
lib/libnss_dns-2.28.so lib/libnss_dns-2.29.so
lib/libnss_dns.so.2 lib/libnss_dns.so.2
lib/libnss_files-2.28.so lib/libnss_files-2.29.so
lib/libnss_files.so.2 lib/libnss_files.so.2
lib/libnss_hesiod-2.28.so lib/libnss_hesiod-2.29.so
lib/libnss_hesiod.so.2 lib/libnss_hesiod.so.2
lib/libnss_nis-2.28.so lib/libnss_nis-2.29.so
lib/libnss_nis.so.2 lib/libnss_nis.so.2
lib/libnss_nisplus-2.28.so lib/libnss_nisplus-2.29.so
lib/libnss_nisplus.so.2 lib/libnss_nisplus.so.2
#lib/libpcprofile.so #lib/libpcprofile.so
lib/libpthread-2.28.so lib/libpthread-2.29.so
lib/libpthread.so.0 lib/libpthread.so.0
lib/libresolv-2.28.so lib/libresolv-2.29.so
lib/libresolv.so.2 lib/libresolv.so.2
lib/librt-2.28.so lib/librt-2.29.so
lib/librt.so.1 lib/librt.so.1
lib/libthread_db-1.0.so lib/libthread_db-1.0.so
lib/libthread_db.so.1 lib/libthread_db.so.1
lib/libutil-2.28.so lib/libutil-2.29.so
lib/libutil.so.1 lib/libutil.so.1
sbin/ldconfig sbin/ldconfig
#sbin/sln #sbin/sln
@@ -129,11 +129,13 @@ usr/bin/locale
#usr/include/bits/mathdef.h #usr/include/bits/mathdef.h
#usr/include/bits/mathinline.h #usr/include/bits/mathinline.h
#usr/include/bits/mman-linux.h #usr/include/bits/mman-linux.h
#usr/include/bits/mman-map-flags-generic.h
#usr/include/bits/mman-shared.h #usr/include/bits/mman-shared.h
#usr/include/bits/mman.h #usr/include/bits/mman.h
#usr/include/bits/monetary-ldbl.h #usr/include/bits/monetary-ldbl.h
#usr/include/bits/mqueue.h #usr/include/bits/mqueue.h
#usr/include/bits/mqueue2.h #usr/include/bits/mqueue2.h
#usr/include/bits/msq-pad.h
#usr/include/bits/msq.h #usr/include/bits/msq.h
#usr/include/bits/netdb.h #usr/include/bits/netdb.h
#usr/include/bits/param.h #usr/include/bits/param.h
@@ -143,6 +145,10 @@ usr/bin/locale
#usr/include/bits/posix2_lim.h #usr/include/bits/posix2_lim.h
#usr/include/bits/posix_opt.h #usr/include/bits/posix_opt.h
#usr/include/bits/printf-ldbl.h #usr/include/bits/printf-ldbl.h
#usr/include/bits/procfs-extra.h
#usr/include/bits/procfs-id.h
#usr/include/bits/procfs-prregset.h
#usr/include/bits/procfs.h
#usr/include/bits/pthreadtypes-arch.h #usr/include/bits/pthreadtypes-arch.h
#usr/include/bits/pthreadtypes.h #usr/include/bits/pthreadtypes.h
#usr/include/bits/ptrace-shared.h #usr/include/bits/ptrace-shared.h
@@ -150,11 +156,14 @@ usr/bin/locale
#usr/include/bits/sched.h #usr/include/bits/sched.h
#usr/include/bits/select.h #usr/include/bits/select.h
#usr/include/bits/select2.h #usr/include/bits/select2.h
#usr/include/bits/sem-pad.h
#usr/include/bits/sem.h #usr/include/bits/sem.h
#usr/include/bits/semaphore.h #usr/include/bits/semaphore.h
#usr/include/bits/setjmp.h #usr/include/bits/setjmp.h
#usr/include/bits/setjmp2.h #usr/include/bits/setjmp2.h
#usr/include/bits/shm-pad.h
#usr/include/bits/shm.h #usr/include/bits/shm.h
#usr/include/bits/shmlba.h
#usr/include/bits/sigaction.h #usr/include/bits/sigaction.h
#usr/include/bits/sigcontext.h #usr/include/bits/sigcontext.h
#usr/include/bits/sigevent-consts.h #usr/include/bits/sigevent-consts.h
@@ -196,10 +205,21 @@ usr/bin/locale
#usr/include/bits/syslog-path.h #usr/include/bits/syslog-path.h
#usr/include/bits/syslog.h #usr/include/bits/syslog.h
#usr/include/bits/sysmacros.h #usr/include/bits/sysmacros.h
#usr/include/bits/termios-baud.h
#usr/include/bits/termios-c_cc.h
#usr/include/bits/termios-c_cflag.h
#usr/include/bits/termios-c_iflag.h
#usr/include/bits/termios-c_lflag.h
#usr/include/bits/termios-c_oflag.h
#usr/include/bits/termios-misc.h
#usr/include/bits/termios-struct.h
#usr/include/bits/termios-tcflow.h
#usr/include/bits/termios.h #usr/include/bits/termios.h
#usr/include/bits/thread-shared-types.h #usr/include/bits/thread-shared-types.h
#usr/include/bits/time.h #usr/include/bits/time.h
#usr/include/bits/time64.h
#usr/include/bits/timerfd.h #usr/include/bits/timerfd.h
#usr/include/bits/timesize.h
#usr/include/bits/timex.h #usr/include/bits/timex.h
#usr/include/bits/types #usr/include/bits/types
#usr/include/bits/types.h #usr/include/bits/types.h

View File

@@ -1,47 +1,47 @@
#etc/ld.so.cache #etc/ld.so.cache
etc/rpc etc/rpc
lib/ld-2.28.so lib/ld-2.29.so
lib/ld-linux.so.2 lib/ld-linux.so.2
lib/libBrokenLocale-2.28.so lib/libBrokenLocale-2.29.so
lib/libBrokenLocale.so.1 lib/libBrokenLocale.so.1
#lib/libSegFault.so #lib/libSegFault.so
lib/libanl-2.28.so lib/libanl-2.29.so
lib/libanl.so.1 lib/libanl.so.1
lib/libc-2.28.so lib/libc-2.29.so
lib/libc.so.6 lib/libc.so.6
lib/libcrypt-2.28.so lib/libcrypt-2.29.so
lib/libcrypt.so.1 lib/libcrypt.so.1
lib/libdl-2.28.so lib/libdl-2.29.so
lib/libdl.so.2 lib/libdl.so.2
lib/libm-2.28.so lib/libm-2.29.so
lib/libm.so.6 lib/libm.so.6
#lib/libmemusage.so #lib/libmemusage.so
lib/libnsl-2.28.so lib/libnsl-2.29.so
lib/libnsl.so.1 lib/libnsl.so.1
lib/libnss_compat-2.28.so lib/libnss_compat-2.29.so
lib/libnss_compat.so.2 lib/libnss_compat.so.2
lib/libnss_db-2.28.so lib/libnss_db-2.29.so
lib/libnss_db.so.2 lib/libnss_db.so.2
lib/libnss_dns-2.28.so lib/libnss_dns-2.29.so
lib/libnss_dns.so.2 lib/libnss_dns.so.2
lib/libnss_files-2.28.so lib/libnss_files-2.29.so
lib/libnss_files.so.2 lib/libnss_files.so.2
lib/libnss_hesiod-2.28.so lib/libnss_hesiod-2.29.so
lib/libnss_hesiod.so.2 lib/libnss_hesiod.so.2
lib/libnss_nis-2.28.so lib/libnss_nis-2.29.so
lib/libnss_nis.so.2 lib/libnss_nis.so.2
lib/libnss_nisplus-2.28.so lib/libnss_nisplus-2.29.so
lib/libnss_nisplus.so.2 lib/libnss_nisplus.so.2
#lib/libpcprofile.so #lib/libpcprofile.so
lib/libpthread-2.28.so lib/libpthread-2.29.so
lib/libpthread.so.0 lib/libpthread.so.0
lib/libresolv-2.28.so lib/libresolv-2.29.so
lib/libresolv.so.2 lib/libresolv.so.2
lib/librt-2.28.so lib/librt-2.29.so
lib/librt.so.1 lib/librt.so.1
lib/libthread_db-1.0.so lib/libthread_db-1.0.so
lib/libthread_db.so.1 lib/libthread_db.so.1
lib/libutil-2.28.so lib/libutil-2.29.so
lib/libutil.so.1 lib/libutil.so.1
sbin/ldconfig sbin/ldconfig
#sbin/sln #sbin/sln
@@ -130,11 +130,13 @@ usr/bin/locale
#usr/include/bits/mathdef.h #usr/include/bits/mathdef.h
#usr/include/bits/mathinline.h #usr/include/bits/mathinline.h
#usr/include/bits/mman-linux.h #usr/include/bits/mman-linux.h
#usr/include/bits/mman-map-flags-generic.h
#usr/include/bits/mman-shared.h #usr/include/bits/mman-shared.h
#usr/include/bits/mman.h #usr/include/bits/mman.h
#usr/include/bits/monetary-ldbl.h #usr/include/bits/monetary-ldbl.h
#usr/include/bits/mqueue.h #usr/include/bits/mqueue.h
#usr/include/bits/mqueue2.h #usr/include/bits/mqueue2.h
#usr/include/bits/msq-pad.h
#usr/include/bits/msq.h #usr/include/bits/msq.h
#usr/include/bits/netdb.h #usr/include/bits/netdb.h
#usr/include/bits/param.h #usr/include/bits/param.h
@@ -144,6 +146,10 @@ usr/bin/locale
#usr/include/bits/posix2_lim.h #usr/include/bits/posix2_lim.h
#usr/include/bits/posix_opt.h #usr/include/bits/posix_opt.h
#usr/include/bits/printf-ldbl.h #usr/include/bits/printf-ldbl.h
#usr/include/bits/procfs-extra.h
#usr/include/bits/procfs-id.h
#usr/include/bits/procfs-prregset.h
#usr/include/bits/procfs.h
#usr/include/bits/pthreadtypes-arch.h #usr/include/bits/pthreadtypes-arch.h
#usr/include/bits/pthreadtypes.h #usr/include/bits/pthreadtypes.h
#usr/include/bits/ptrace-shared.h #usr/include/bits/ptrace-shared.h
@@ -151,11 +157,14 @@ usr/bin/locale
#usr/include/bits/sched.h #usr/include/bits/sched.h
#usr/include/bits/select.h #usr/include/bits/select.h
#usr/include/bits/select2.h #usr/include/bits/select2.h
#usr/include/bits/sem-pad.h
#usr/include/bits/sem.h #usr/include/bits/sem.h
#usr/include/bits/semaphore.h #usr/include/bits/semaphore.h
#usr/include/bits/setjmp.h #usr/include/bits/setjmp.h
#usr/include/bits/setjmp2.h #usr/include/bits/setjmp2.h
#usr/include/bits/shm-pad.h
#usr/include/bits/shm.h #usr/include/bits/shm.h
#usr/include/bits/shmlba.h
#usr/include/bits/sigaction.h #usr/include/bits/sigaction.h
#usr/include/bits/sigcontext.h #usr/include/bits/sigcontext.h
#usr/include/bits/sigevent-consts.h #usr/include/bits/sigevent-consts.h
@@ -197,10 +206,21 @@ usr/bin/locale
#usr/include/bits/syslog-path.h #usr/include/bits/syslog-path.h
#usr/include/bits/syslog.h #usr/include/bits/syslog.h
#usr/include/bits/sysmacros.h #usr/include/bits/sysmacros.h
#usr/include/bits/termios-baud.h
#usr/include/bits/termios-c_cc.h
#usr/include/bits/termios-c_cflag.h
#usr/include/bits/termios-c_iflag.h
#usr/include/bits/termios-c_lflag.h
#usr/include/bits/termios-c_oflag.h
#usr/include/bits/termios-misc.h
#usr/include/bits/termios-struct.h
#usr/include/bits/termios-tcflow.h
#usr/include/bits/termios.h #usr/include/bits/termios.h
#usr/include/bits/thread-shared-types.h #usr/include/bits/thread-shared-types.h
#usr/include/bits/time.h #usr/include/bits/time.h
#usr/include/bits/time64.h
#usr/include/bits/timerfd.h #usr/include/bits/timerfd.h
#usr/include/bits/timesize.h
#usr/include/bits/timex.h #usr/include/bits/timex.h
#usr/include/bits/types #usr/include/bits/types
#usr/include/bits/types.h #usr/include/bits/types.h

View File

@@ -16,7 +16,9 @@ usr/bin/strings
#usr/bin/strip #usr/bin/strip
#usr/include/ansidecl.h #usr/include/ansidecl.h
#usr/include/bfd.h #usr/include/bfd.h
#usr/include/bfd_stdint.h
#usr/include/bfdlink.h #usr/include/bfdlink.h
#usr/include/diagnostics.h
#usr/include/dis-asm.h #usr/include/dis-asm.h
#usr/include/libiberty.h #usr/include/libiberty.h
#usr/include/plugin-api.h #usr/include/plugin-api.h
@@ -154,17 +156,11 @@ usr/bin/strings
#usr/lib/ldscripts/elf_x86_64.xu #usr/lib/ldscripts/elf_x86_64.xu
#usr/lib/ldscripts/elf_x86_64.xw #usr/lib/ldscripts/elf_x86_64.xw
#usr/lib/ldscripts/elf_x86_64.xwe #usr/lib/ldscripts/elf_x86_64.xwe
#usr/lib/ldscripts/i386linux.x usr/lib/libbfd-2.32.so
#usr/lib/ldscripts/i386linux.xbn
#usr/lib/ldscripts/i386linux.xe
#usr/lib/ldscripts/i386linux.xn
#usr/lib/ldscripts/i386linux.xr
#usr/lib/ldscripts/i386linux.xu
usr/lib/libbfd-2.30.so
#usr/lib/libbfd.a #usr/lib/libbfd.a
#usr/lib/libbfd.la #usr/lib/libbfd.la
#usr/lib/libbfd.so #usr/lib/libbfd.so
usr/lib/libopcodes-2.30.so usr/lib/libopcodes-2.32.so
#usr/lib/libopcodes.a #usr/lib/libopcodes.a
#usr/lib/libopcodes.la #usr/lib/libopcodes.la
#usr/lib/libopcodes.so #usr/lib/libopcodes.so
@@ -232,6 +228,10 @@ usr/lib/libopcodes-2.30.so
#usr/share/locale/ms/LC_MESSAGES/gprof.mo #usr/share/locale/ms/LC_MESSAGES/gprof.mo
#usr/share/locale/nl/LC_MESSAGES/gprof.mo #usr/share/locale/nl/LC_MESSAGES/gprof.mo
#usr/share/locale/nl/LC_MESSAGES/opcodes.mo #usr/share/locale/nl/LC_MESSAGES/opcodes.mo
#usr/share/locale/pt
#usr/share/locale/pt/LC_MESSAGES
#usr/share/locale/pt/LC_MESSAGES/bfd.mo
#usr/share/locale/pt/LC_MESSAGES/binutils.mo
#usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo #usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
#usr/share/locale/pt_BR/LC_MESSAGES/ld.mo #usr/share/locale/pt_BR/LC_MESSAGES/ld.mo
#usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo #usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
@@ -296,7 +296,6 @@ usr/lib/libopcodes-2.30.so
#usr/share/man/man1/elfedit.1 #usr/share/man/man1/elfedit.1
#usr/share/man/man1/gprof.1 #usr/share/man/man1/gprof.1
#usr/share/man/man1/ld.1 #usr/share/man/man1/ld.1
#usr/share/man/man1/nlmconv.1
#usr/share/man/man1/nm.1 #usr/share/man/man1/nm.1
#usr/share/man/man1/objcopy.1 #usr/share/man/man1/objcopy.1
#usr/share/man/man1/objdump.1 #usr/share/man/man1/objdump.1

File diff suppressed because it is too large Load Diff

View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 2.30 VER = 2.32
THISAPP = binutils-$(VER) THISAPP = binutils-$(VER)
DL_FILE = $(THISAPP).tar.xz DL_FILE = $(THISAPP).tar.xz
@@ -94,7 +94,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ffc476dd46c96f932875d1b2e27e929f $(DL_FILE)_MD5 = 0d174cdaf85721c5723bf52355be41e6
install : $(TARGET) install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 7.3.0 VER = 8.3.0
GMP_VER = 6.1.2 GMP_VER = 6.1.2
MPFR_VER = 3.1.6 MPFR_VER = 3.1.6
@@ -189,7 +189,7 @@ gmp-$(GMP_VER).tar.xz = $(DL_FROM)/gmp-$(GMP_VER).tar.xz
mpfr-$(MPFR_VER).tar.xz = $(DL_FROM)/mpfr-$(MPFR_VER).tar.xz mpfr-$(MPFR_VER).tar.xz = $(DL_FROM)/mpfr-$(MPFR_VER).tar.xz
mpc-$(MPC_VER).tar.gz = $(DL_FROM)/mpc-$(MPC_VER).tar.gz mpc-$(MPC_VER).tar.gz = $(DL_FROM)/mpc-$(MPC_VER).tar.gz
$(DL_FILE)_MD5 = be2da21680f27624f3a87055c4ba5af2 $(DL_FILE)_MD5 = 65b210b4bfe7e060051f799e0f994896
gmp-$(GMP_VER).tar.xz_MD5 = f58fa8001d60c4c77595fbbb62b63c1d gmp-$(GMP_VER).tar.xz_MD5 = f58fa8001d60c4c77595fbbb62b63c1d
mpfr-$(MPFR_VER).tar.xz_MD5 = 51bfdbf81553966c8d43808122cc81b3 mpfr-$(MPFR_VER).tar.xz_MD5 = 51bfdbf81553966c8d43808122cc81b3
mpc-$(MPC_VER).tar.gz_MD5 = d6a1d5f8ddea3abd2cc3e98f58352d26 mpc-$(MPC_VER).tar.gz_MD5 = d6a1d5f8ddea3abd2cc3e98f58352d26
@@ -224,8 +224,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
@mkdir $(DIR_SRC)/gcc-build @mkdir $(DIR_SRC)/gcc-build
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc-7-glibc-2.28-ustat.patch
cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
cd $(DIR_APP) && sed -i gcc/Makefile.in \ cd $(DIR_APP) && sed -i gcc/Makefile.in \
-e 's@\./fixinc\.sh@-c true@' \ -e 's@\./fixinc\.sh@-c true@' \

View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 2.28 VER = 2.29
THISAPP = glibc-$(VER) THISAPP = glibc-$(VER)
DL_FILE = $(THISAPP).tar.xz DL_FILE = $(THISAPP).tar.xz
@@ -93,7 +93,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = c81d2388896379997bc359d4f2084239 $(DL_FILE)_MD5 = e6c279d5b2f0736f740216f152acf974
install : $(TARGET) install : $(TARGET)

View File

@@ -36,6 +36,23 @@ PAK_VER = 3
DEPS = "" DEPS = ""
# Normal build or $(TOOLS_DIR) build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
CONFIGURE_ARGS = \
--prefix=/usr \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--with-ensurepip
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
CONFIGURE_ARGS = \
--prefix=$(TOOLS_DIR) \
--without-ensurepip
endif
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
############################################################################### ###############################################################################
@@ -77,12 +94,14 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
--prefix=/usr \
--enable-shared \
--with-system-ffi
ifeq "$(ROOT)" ""
rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
else
cd $(DIR_APP) && sed -i '/def add_multiarch_paths/a \ return' setup.py
endif
cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure $(CONFIGURE_ARGS)
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)

View File

@@ -38,7 +38,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
GIT_TAG=$(git tag | tail -1) # Git Tag GIT_TAG=$(git tag | tail -1) # Git Tag
GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
TOOLCHAINVER=20181030 TOOLCHAINVER=20190427
############################################################################### ###############################################################################
# #
@@ -1014,6 +1014,7 @@ buildtoolchain() {
lfsmake1 make lfsmake1 make
lfsmake1 patch lfsmake1 patch
lfsmake1 perl lfsmake1 perl
lfsmake1 python3
lfsmake1 sed lfsmake1 sed
lfsmake1 tar lfsmake1 tar
lfsmake1 texinfo lfsmake1 texinfo

View File

@@ -1,31 +0,0 @@
--- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/04/25 07:39:32 259630
+++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/05/24 20:07:25 260687
@@ -157,7 +157,6 @@
# include <sys/procfs.h>
#endif
#include <sys/user.h>
-#include <sys/ustat.h>
#include <linux/cyclades.h>
#include <linux/if_eql.h>
#include <linux/if_plip.h>
@@ -250,7 +249,19 @@
#endif // SANITIZER_LINUX || SANITIZER_FREEBSD
#if SANITIZER_LINUX && !SANITIZER_ANDROID
- unsigned struct_ustat_sz = sizeof(struct ustat);
+ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
+ // has been removed from glibc 2.28.
+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
+ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
+ || defined(__x86_64__)
+#define SIZEOF_STRUCT_USTAT 32
+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
+ || defined(__powerpc__) || defined(__s390__)
+#define SIZEOF_STRUCT_USTAT 20
+#else
+#error Unknown size of struct ustat
+#endif
+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
#endif // SANITIZER_LINUX && !SANITIZER_ANDROID