From 8d636658182a3e3f234e8ce032afc6562cd8dd01 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 10 Feb 2022 15:00:09 -0800 Subject: glibc-ports: remove obsolete versions The corresponding versions of glibc have been removed previously; kill their "ports" counterpart. Signed-off-by: Alexey Neyman diff --git a/packages/glibc-ports/2.13/0000-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.13/0000-Fix-ARM-build-with-GCC-trunk.patch deleted file mode 100644 index af8d28a..0000000 --- a/packages/glibc-ports/2.13/0000-Fix-ARM-build-with-GCC-trunk.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001 -From: Joseph Myers -Date: Tue, 20 May 2014 21:27:13 +0000 -Subject: [PATCH] Fix ARM build with GCC trunk. - -sysdeps/unix/sysv/linux/arm/unwind-resume.c and -sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static -variables that are written in C code but only read from toplevel asms. -Current GCC trunk now optimizes away such apparently write-only static -variables, so causing a build failure. This patch marks those -variables with __attribute_used__ to avoid that optimization. - -Tested that this fixes the build for ARM. - - * sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c - (libgcc_s_resume): Use __attribute_used__. - * sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume): - Likewise. ---- - sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c | 3 ++- - sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c | 3 ++- - sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | 3 ++- - sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | 3 ++- - 4 files changed, 8 insertions(+), 4 deletions(-) ---- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c -+++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c -@@ -23,7 +23,8 @@ - #include - - static void *libgcc_s_handle; --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *, - struct _Unwind_Context *); ---- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c -+++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c -@@ -21,7 +21,8 @@ - #include - #include - --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *, - struct _Unwind_Context *); ---- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c -+++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c -@@ -23,7 +23,8 @@ - #include - - static void *libgcc_s_handle; --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); - static _Unwind_Reason_Code (*libgcc_s_forcedunwind) ---- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c -+++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c -@@ -21,7 +21,8 @@ - #include - #include - --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); - diff --git a/packages/glibc-ports/2.13/0001-m68k-sys-user.patch b/packages/glibc-ports/2.13/0001-m68k-sys-user.patch deleted file mode 100644 index a03b08d..0000000 --- a/packages/glibc-ports/2.13/0001-m68k-sys-user.patch +++ /dev/null @@ -1,99 +0,0 @@ -copied from kernel as it is sanitized now - ---- - sysdeps/unix/sysv/linux/m68k/sys/user.h | 87 ++++++++++++++++++++++++++++++++ - 1 file changed, 87 insertions(+) - ---- a/sysdeps/unix/sysv/linux/m68k/sys/user.h -+++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h -@@ -1,3 +1,90 @@ -+#ifndef _SYS_USER_H -+#define _SYS_USER_H -+ -+/* Core file format: The core file is written in such a way that gdb -+ can understand it and provide useful information to the user (under -+ linux we use the 'trad-core' bfd). There are quite a number of -+ obstacles to being able to view the contents of the floating point -+ registers, and until these are solved you will not be able to view the -+ contents of them. Actually, you can read in the core file and look at -+ the contents of the user struct to find out what the floating point -+ registers contain. -+ The actual file contents are as follows: -+ UPAGE: 1 page consisting of a user struct that tells gdb what is present -+ in the file. Directly after this is a copy of the task_struct, which -+ is currently not used by gdb, but it may come in useful at some point. -+ All of the registers are stored as part of the upage. The upage should -+ always be only one page. -+ DATA: The data area is stored. We use current->end_text to -+ current->brk to pick up all of the user variables, plus any memory -+ that may have been malloced. No attempt is made to determine if a page -+ is demand-zero or if a page is totally unused, we just cover the entire -+ range. All of the addresses are rounded in such a way that an integral -+ number of pages is written. -+ STACK: We need the stack information in order to get a meaningful -+ backtrace. We need to write the data from (esp) to -+ current->start_stack, so we round each of these off in order to be able -+ to write an integer number of pages. -+ The minimum core file size is 3 pages, or 12288 bytes. -+*/ -+ -+struct user_m68kfp_struct { -+ unsigned long fpregs[8*3]; /* fp0-fp7 registers */ -+ unsigned long fpcntl[3]; /* fp control regs */ -+}; -+ -+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and -+ is still the layout used by user (the new pt_regs doesn't have -+ all registers). */ -+struct user_regs_struct { -+ long d1,d2,d3,d4,d5,d6,d7; -+ long a0,a1,a2,a3,a4,a5,a6; -+ long d0; -+ long usp; -+ long orig_d0; -+ short stkadj; -+ short sr; -+ long pc; -+ short fmtvec; -+ short __fill; -+}; -+ -+ -+/* When the kernel dumps core, it starts by dumping the user struct - -+ this will be used by gdb to figure out where the data and stack segments -+ are within the file, and what virtual addresses to use. */ -+struct user{ -+/* We start with the registers, to mimic the way that "memory" is returned -+ from the ptrace(3,...) function. */ -+ struct user_regs_struct regs; /* Where the registers are actually stored */ -+/* ptrace does not yet supply these. Someday.... */ -+ int u_fpvalid; /* True if math co-processor being used. */ -+ /* for this mess. Not yet used. */ -+ struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */ -+/* The rest of this junk is to help gdb figure out what goes where */ -+ unsigned long int u_tsize; /* Text segment size (pages). */ -+ unsigned long int u_dsize; /* Data segment size (pages). */ -+ unsigned long int u_ssize; /* Stack segment size (pages). */ -+ unsigned long start_code; /* Starting virtual address of text. */ -+ unsigned long start_stack; /* Starting virtual address of stack area. -+ This is actually the bottom of the stack, -+ the top of the stack is always found in the -+ esp register. */ -+ long int signal; /* Signal that caused the core dump. */ -+ int reserved; /* No longer used */ -+ struct user_regs_struct *u_ar0; -+ /* Used by gdb to help find the values for */ -+ /* the registers. */ -+ struct user_m68kfp_struct* u_fpstate; /* Math Co-processor pointer. */ -+ unsigned long magic; /* To uniquely identify a core file */ -+ char u_comm[32]; /* User command that was responsible */ -+}; -+#define NBPG 4096 -+#define UPAGES 1 -+#define HOST_TEXT_START_ADDR (u.start_code) -+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) -+ -+#endif - /* Copyright (C) 2008, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - diff --git a/packages/glibc-ports/2.13/0002-alpha-SETPIPE-GETPIPE.patch b/packages/glibc-ports/2.13/0002-alpha-SETPIPE-GETPIPE.patch deleted file mode 100644 index e806e95..0000000 --- a/packages/glibc-ports/2.13/0002-alpha-SETPIPE-GETPIPE.patch +++ /dev/null @@ -1,20 +0,0 @@ -2011-02-28 Aurelien Jarno - - * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (F_SETPIPE_SZ, - F_GETPIPE_SZ): Define. - ---- - sysdeps/unix/sysv/linux/alpha/bits/fcntl.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h -+++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h -@@ -97,6 +97,8 @@ - # define F_SETLEASE 1024 /* Set a lease. */ - # define F_GETLEASE 1025 /* Enquire what lease is active. */ - # define F_NOTIFY 1026 /* Request notfications on a directory. */ -+# define F_SETPIPE_SZ 1031 /* Set pipe page size array. */ -+# define F_GETPIPE_SZ 1032 /* Set pipe page size array. */ - #endif - #ifdef __USE_XOPEN2K8 - # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with diff --git a/packages/glibc-ports/2.13/0003-alpha-statfs.patch b/packages/glibc-ports/2.13/0003-alpha-statfs.patch deleted file mode 100644 index d9659eb..0000000 --- a/packages/glibc-ports/2.13/0003-alpha-statfs.patch +++ /dev/null @@ -1,31 +0,0 @@ -2011-02-28 Aurelien Jarno - - * sysdeps/unix/sysv/linux/mips/bits/statfs.h (struct statfs, - struct statfs64): Add f_flags field. - ---- - sysdeps/unix/sysv/linux/alpha/bits/statfs.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/sysdeps/unix/sysv/linux/alpha/bits/statfs.h -+++ b/sysdeps/unix/sysv/linux/alpha/bits/statfs.h -@@ -42,7 +42,8 @@ - __fsid_t f_fsid; - int f_namelen; - int f_frsize; -- int f_spare[5]; -+ int f_flags; -+ int f_spare[4]; - }; - - #ifdef __USE_LARGEFILE64 -@@ -58,7 +59,8 @@ - __fsid_t f_fsid; - int f_namelen; - int f_frsize; -- int f_spare[5]; -+ int f_flags; -+ int f_spare[4]; - }; - #endif - diff --git a/packages/glibc-ports/2.13/0004-alpha-cache-shape.patch b/packages/glibc-ports/2.13/0004-alpha-cache-shape.patch deleted file mode 100644 index ca608bc..0000000 --- a/packages/glibc-ports/2.13/0004-alpha-cache-shape.patch +++ /dev/null @@ -1,16 +0,0 @@ -older verisons of glibc would build dl-sysdep as shared-only and dl-support as -static-only. alpha hooks in a cache variable via dl-auxv.h. newer versions of -glibc build dl-sysdep as both shared and static which means we now have symbol -duplication for static builds with dl-sysdep and dl-support. since dl-sysdep -is both shared/static, there is no point in hooking dl-support anymore, so we -can punt it. - ---- - sysdeps/unix/sysv/linux/alpha/dl-support.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/sysdeps/unix/sysv/linux/alpha/dl-support.c -+++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c -@@ -1,2 +1 @@ --#include "dl-auxv.h" - #include diff --git a/packages/glibc-ports/2.13/0005-alpha-DEFAULT_STACK_PERMS.patch b/packages/glibc-ports/2.13/0005-alpha-DEFAULT_STACK_PERMS.patch deleted file mode 100644 index a5a9615..0000000 --- a/packages/glibc-ports/2.13/0005-alpha-DEFAULT_STACK_PERMS.patch +++ /dev/null @@ -1,24 +0,0 @@ -2011-02-28 Aurelien Jarno - - * sysdeps/alpha/stackinfo.h: Define DEFAULT_STACK_PERMS with PF_X. - ---- - sysdeps/alpha/stackinfo.h | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/sysdeps/alpha/stackinfo.h -+++ b/sysdeps/alpha/stackinfo.h -@@ -22,7 +22,13 @@ - #ifndef _STACKINFO_H - #define _STACKINFO_H 1 - -+#include -+ - /* On Alpha the stack grows down. */ - #define _STACK_GROWS_DOWN 1 - -+/* Default to an executable stack. PF_X can be overridden if PT_GNU_STACK is -+ * present, but it is presumed absent. */ -+#define DEFAULT_STACK_PERMS (PF_R|PF_W|PF_X) -+ - #endif /* stackinfo.h */ diff --git a/packages/glibc-ports/2.13/0006-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.13/0006-alpha-fix-gcc-4.1-warnings.patch deleted file mode 100644 index fef37a5..0000000 --- a/packages/glibc-ports/2.13/0006-alpha-fix-gcc-4.1-warnings.patch +++ /dev/null @@ -1,54 +0,0 @@ -2006-05-30 Falk Hueffner - - * sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture - to ev6 in assembly code. - -{standard input}: Assembler messages: -{standard input}:341: Error: macro requires $at register while noat in effect -{standard input}:374: Error: macro requires $at register while noat in effect -{standard input}:438: Error: macro requires $at register while noat in effect -{standard input}:471: Error: macro requires $at register while noat in effect -make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1 - -Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as. -I cannot really think of anything better than - - sysdeps/unix/sysv/linux/alpha/ioperm.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/sysdeps/unix/sysv/linux/alpha/ioperm.c -+++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c -@@ -178,13 +178,13 @@ - static inline void - stb_mb(unsigned char val, unsigned long addr) - { -- __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val)); -+ __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val)); - } - - static inline void - stw_mb(unsigned short val, unsigned long addr) - { -- __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val)); -+ __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val)); - } - - static inline void -@@ -356,7 +356,7 @@ - unsigned long int addr = dense_port_to_cpu_addr (port); - unsigned char r; - -- __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr)); -+ __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr)); - return r; - } - -@@ -366,7 +366,7 @@ - unsigned long int addr = dense_port_to_cpu_addr (port); - unsigned short r; - -- __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr)); -+ __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr)); - return r; - } - diff --git a/packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch b/packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch deleted file mode 100644 index 164276f..0000000 --- a/packages/glibc-ports/2.13/0007-alpha-feupdateenv.patch +++ /dev/null @@ -1,26 +0,0 @@ -2011-03-01 Aurelien Jarno - - * sysdeps/alpha/fpu/feupdateenv.c (feupdateenv): Add - libm_hidden_def. - * sysdeps/alpha/fpu/ftestexcept.c (fetestexcept): Likewise. - ---- - sysdeps/alpha/fpu/feupdateenv.c | 1 + - sysdeps/alpha/fpu/ftestexcept.c | 1 + - 2 files changed, 2 insertions(+) - ---- a/sysdeps/alpha/fpu/feupdateenv.c -+++ b/sysdeps/alpha/fpu/feupdateenv.c -@@ -46,4 +46,5 @@ - compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1); - #endif - -+libm_hidden_ver (__feupdateenv, feupdateenv) - versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2); ---- a/sysdeps/alpha/fpu/ftestexcept.c -+++ b/sysdeps/alpha/fpu/ftestexcept.c -@@ -30,3 +30,4 @@ - - return tmp & excepts & SWCR_STATUS_MASK; - } -+libm_hidden_def (fetestexcept) diff --git a/packages/glibc-ports/2.13/0008-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.13/0008-alpha-fix-rtld-fPIC.patch deleted file mode 100644 index 53a0992..0000000 --- a/packages/glibc-ports/2.13/0008-alpha-fix-rtld-fPIC.patch +++ /dev/null @@ -1,19 +0,0 @@ -2009-05-26 Aurelien Jarno - - * sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag). - - sysdeps/alpha/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/sysdeps/alpha/Makefile -+++ b/sysdeps/alpha/Makefile -@@ -35,7 +35,8 @@ - - ifeq ($(subdir),elf) - # The ld.so startup code cannot use literals until it self-relocates. --CFLAGS-rtld.c = -mbuild-constants -+# It uses more than 64k for the small data area. -+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag) - endif - - # Build everything with full IEEE math support, and with dynamic rounding; diff --git a/packages/glibc-ports/2.13/0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.13/0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch deleted file mode 100644 index 855dde2..0000000 --- a/packages/glibc-ports/2.13/0009-arm-cirrus-ep93xx-maverick-crunch-fpu.patch +++ /dev/null @@ -1,366 +0,0 @@ -http://yann.poupet.free.fr/ep93xx/ -Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series - ---- - sysdeps/arm/bits/endian.h | 2 - - sysdeps/arm/fpu/__longjmp.S | 26 +++++++++++++ - sysdeps/arm/fpu/bits/fenv.h | 41 ++++++++++++++++++++ - sysdeps/arm/fpu/bits/setjmp.h | 4 ++ - sysdeps/arm/fpu/fegetround.c | 12 ++++++ - sysdeps/arm/fpu/fesetround.c | 16 ++++++++ - sysdeps/arm/fpu/fpu_control.h | 78 ++++++++++++++++++++++++++++++++++++++- - sysdeps/arm/fpu/jmpbuf-offsets.h | 4 ++ - sysdeps/arm/fpu/setjmp.S | 30 +++++++++++++++ - sysdeps/arm/gccframe.h | 4 ++ - sysdeps/arm/gmp-mparam.h | 2 - - 11 files changed, 216 insertions(+), 3 deletions(-) - ---- a/sysdeps/arm/bits/endian.h -+++ b/sysdeps/arm/bits/endian.h -@@ -12,7 +12,7 @@ - /* FPA floating point units are always big-endian, irrespective of the - CPU endianness. VFP floating point units use the same endianness - as the rest of the system. */ --#ifdef __VFP_FP__ -+#if defined __VFP_FP__ || defined __MAVERICK__ - #define __FLOAT_WORD_ORDER __BYTE_ORDER - #else - #define __FLOAT_WORD_ORDER __BIG_ENDIAN ---- a/sysdeps/arm/fpu/__longjmp.S -+++ b/sysdeps/arm/fpu/__longjmp.S -@@ -30,7 +30,33 @@ - movs r0, r1 /* get the return value in place */ - moveq r0, #1 /* can't let setjmp() return zero! */ - -+#ifdef __MAVERICK__ -+ cfldrd mvd4, [ip], #8 -+ nop -+ cfldrd mvd5, [ip], #8 -+ nop -+ cfldrd mvd6, [ip], #8 -+ nop -+ cfldrd mvd7, [ip], #8 -+ nop -+ cfldrd mvd8, [ip], #8 -+ nop -+ cfldrd mvd9, [ip], #8 -+ nop -+ cfldrd mvd10, [ip], #8 -+ nop -+ cfldrd mvd11, [ip], #8 -+ nop -+ cfldrd mvd12, [ip], #8 -+ nop -+ cfldrd mvd13, [ip], #8 -+ nop -+ cfldrd mvd14, [ip], #8 -+ nop -+ cfldrd mvd15, [ip], #8 -+#else - lfmfd f4, 4, [ip] ! /* load the floating point regs */ -+#endif - - LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc}) - END (__longjmp) ---- a/sysdeps/arm/fpu/bits/fenv.h -+++ b/sysdeps/arm/fpu/bits/fenv.h -@@ -20,6 +20,45 @@ - # error "Never use directly; include instead." - #endif - -+#if defined(__MAVERICK__) -+ -+/* Define bits representing exceptions in the FPU status word. */ -+enum -+ { -+ FE_INVALID = 1, -+#define FE_INVALID FE_INVALID -+ FE_OVERFLOW = 4, -+#define FE_OVERFLOW FE_OVERFLOW -+ FE_UNDERFLOW = 8, -+#define FE_UNDERFLOW FE_UNDERFLOW -+ FE_INEXACT = 16, -+#define FE_INEXACT FE_INEXACT -+ }; -+ -+/* Amount to shift by to convert an exception to a mask bit. */ -+#define FE_EXCEPT_SHIFT 5 -+ -+/* All supported exceptions. */ -+#define FE_ALL_EXCEPT \ -+ (FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT) -+ -+/* IEEE rounding modes. */ -+enum -+ { -+ FE_TONEAREST = 0, -+#define FE_TONEAREST FE_TONEAREST -+ FE_TOWARDZERO = 0x400, -+#define FE_TOWARDZERO FE_TOWARDZERO -+ FE_DOWNWARD = 0x800, -+#define FE_DOWNWARD FE_DOWNWARD -+ FE_UPWARD = 0xc00, -+#define FE_UPWARD FE_UPWARD -+ }; -+ -+#define FE_ROUND_MASK (FE_UPWARD) -+ -+#else /* FPA */ -+ - /* Define bits representing exceptions in the FPU status word. */ - enum - { -@@ -44,6 +83,8 @@ - modes exist, but you have to encode them in the actual instruction. */ - #define FE_TONEAREST 0 - -+#endif -+ - /* Type representing exception flags. */ - typedef unsigned long int fexcept_t; - ---- a/sysdeps/arm/fpu/bits/setjmp.h -+++ b/sysdeps/arm/fpu/bits/setjmp.h -@@ -28,7 +28,11 @@ - #ifndef _ASM - /* Jump buffer contains v1-v6, sl, fp, sp and pc. Other registers are not - saved. */ -+#ifdef __MAVERICK__ -+typedef int __jmp_buf[34]; -+#else - typedef int __jmp_buf[22]; - #endif -+#endif - - #endif ---- a/sysdeps/arm/fpu/fegetround.c -+++ b/sysdeps/arm/fpu/fegetround.c -@@ -18,9 +18,21 @@ - 02111-1307 USA. */ - - #include -+#include - - int - fegetround (void) - { -+#if defined(__MAVERICK__) -+ -+ unsigned long temp; -+ -+ _FPU_GETCW (temp); -+ return temp & FE_ROUND_MASK; -+ -+#else /* FPA */ -+ - return FE_TONEAREST; /* Easy. :-) */ -+ -+#endif - } ---- a/sysdeps/arm/fpu/fesetround.c -+++ b/sysdeps/arm/fpu/fesetround.c -@@ -18,12 +18,28 @@ - 02111-1307 USA. */ - - #include -+#include - - int - fesetround (int round) - { -+#if defined(__MAVERICK__) -+ unsigned long temp; -+ -+ if (round & ~FE_ROUND_MASK) -+ return 1; -+ -+ _FPU_GETCW (temp); -+ temp = (temp & ~FE_ROUND_MASK) | round; -+ _FPU_SETCW (temp); -+ return 0; -+ -+#else /* FPA */ -+ - /* We only support FE_TONEAREST, so there is no need for any work. */ - return (round == FE_TONEAREST)?0:1; -+ -+#endif - } - - libm_hidden_def (fesetround) ---- a/sysdeps/arm/fpu/fpu_control.h -+++ b/sysdeps/arm/fpu/fpu_control.h -@@ -1,5 +1,6 @@ - /* FPU control word definitions. ARM version. -- Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1997, 1998, 2000, 2005 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -20,6 +21,79 @@ - #ifndef _FPU_CONTROL_H - #define _FPU_CONTROL_H - -+#if defined(__MAVERICK__) -+ -+/* DSPSC register: (from EP9312 User's Guide) -+ * -+ * bits 31..29 - DAID -+ * bits 28..26 - HVID -+ * bits 25..24 - RSVD -+ * bit 23 - ISAT -+ * bit 22 - UI -+ * bit 21 - INT -+ * bit 20 - AEXC -+ * bits 19..18 - SAT -+ * bits 17..16 - FCC -+ * bit 15 - V -+ * bit 14 - FWDEN -+ * bit 13 - Invalid -+ * bit 12 - Denorm -+ * bits 11..10 - RM -+ * bits 9..5 - IXE, UFE, OFE, RSVD, IOE -+ * bits 4..0 - IX, UF, OF, RSVD, IO -+ */ -+ -+/* masking of interrupts */ -+#define _FPU_MASK_IM (1 << 5) /* invalid operation */ -+#define _FPU_MASK_ZM 0 /* divide by zero */ -+#define _FPU_MASK_OM (1 << 7) /* overflow */ -+#define _FPU_MASK_UM (1 << 8) /* underflow */ -+#define _FPU_MASK_PM (1 << 9) /* inexact */ -+#define _FPU_MASK_DM 0 /* denormalized operation */ -+ -+#define _FPU_RESERVED 0xfffff000 /* These bits are reserved. */ -+ -+#define _FPU_DEFAULT 0x00b00000 /* Default value. */ -+#define _FPU_IEEE 0x00b003a0 /* Default + exceptions enabled. */ -+ -+/* Type of the control word. */ -+typedef unsigned int fpu_control_t; -+ -+/* Macros for accessing the hardware control word. */ -+#define _FPU_GETCW(cw) ({ \ -+ register int __t1, __t2; \ -+ \ -+ __asm__ volatile ( \ -+ "cfmvr64l %1, mvdx0\n\t" \ -+ "cfmvr64h %2, mvdx0\n\t" \ -+ "cfmv32sc mvdx0, dspsc\n\t" \ -+ "cfmvr64l %0, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %1\n\t" \ -+ "cfmv64hr mvdx0, %2" \ -+ : "=r" (cw), "=r" (__t1), "=r" (__t2) \ -+ ); \ -+}) -+ -+#define _FPU_SETCW(cw) ({ \ -+ register int __t0, __t1, __t2; \ -+ \ -+ __asm__ volatile ( \ -+ "cfmvr64l %1, mvdx0\n\t" \ -+ "cfmvr64h %2, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %0\n\t" \ -+ "cfmvsc32 dspsc, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %1\n\t" \ -+ "cfmv64hr mvdx0, %2" \ -+ : "=r" (__t0), "=r" (__t1), "=r" (__t2) \ -+ : "0" (cw) \ -+ ); \ -+}) -+ -+/* Default control word set at startup. */ -+extern fpu_control_t __fpu_control; -+ -+#else /* FPA */ -+ - /* We have a slight terminology confusion here. On the ARM, the register - * we're interested in is actually the FPU status word - the FPU control - * word is something different (which is implementation-defined and only -@@ -99,4 +173,6 @@ - /* Default control word set at startup. */ - extern fpu_control_t __fpu_control; - -+#endif -+ - #endif /* _FPU_CONTROL_H */ ---- a/sysdeps/arm/fpu/jmpbuf-offsets.h -+++ b/sysdeps/arm/fpu/jmpbuf-offsets.h -@@ -17,4 +17,8 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#ifdef __MAVERICK__ -+#define __JMP_BUF_SP 32 -+#else - #define __JMP_BUF_SP 20 -+#endif ---- a/sysdeps/arm/fpu/setjmp.S -+++ b/sysdeps/arm/fpu/setjmp.S -@@ -24,11 +24,41 @@ - - ENTRY (__sigsetjmp) - /* Save registers */ -+#ifdef __MAVERICK__ -+ cfstrd mvd4, [r0], #8 -+ nop -+ cfstrd mvd5, [r0], #8 -+ nop -+ cfstrd mvd6, [r0], #8 -+ nop -+ cfstrd mvd7, [r0], #8 -+ nop -+ cfstrd mvd8, [r0], #8 -+ nop -+ cfstrd mvd9, [r0], #8 -+ nop -+ cfstrd mvd10, [r0], #8 -+ nop -+ cfstrd mvd11, [r0], #8 -+ nop -+ cfstrd mvd12, [r0], #8 -+ nop -+ cfstrd mvd13, [r0], #8 -+ nop -+ cfstrd mvd14, [r0], #8 -+ nop -+ cfstrd mvd15, [r0], #8 -+#else - sfmea f4, 4, [r0]! -+#endif - stmia r0, {v1-v6, sl, fp, sp, lr} - - /* Restore pointer to jmp_buf */ -+#ifdef __MAVERICK__ -+ sub r0, r0, #96 -+#else - sub r0, r0, #48 -+#endif - - /* Make a tail call to __sigjmp_save; it takes the same args. */ - B PLTJMP(C_SYMBOL_NAME(__sigjmp_save)) ---- a/sysdeps/arm/gccframe.h -+++ b/sysdeps/arm/gccframe.h -@@ -17,6 +17,10 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#ifdef __MAVERICK__ -+#define FIRST_PSEUDO_REGISTER 43 -+#else - #define FIRST_PSEUDO_REGISTER 27 -+#endif - - #include ---- a/sysdeps/arm/gmp-mparam.h -+++ b/sysdeps/arm/gmp-mparam.h -@@ -29,7 +29,7 @@ - #if defined(__ARMEB__) - # define IEEE_DOUBLE_MIXED_ENDIAN 0 - # define IEEE_DOUBLE_BIG_ENDIAN 1 --#elif defined(__VFP_FP__) -+#elif defined(__VFP_FP__) || defined(__MAVERICK__) - # define IEEE_DOUBLE_MIXED_ENDIAN 0 - # define IEEE_DOUBLE_BIG_ENDIAN 0 - #else diff --git a/packages/glibc-ports/2.13/0010-nptl-lowlevellock.patch b/packages/glibc-ports/2.13/0010-nptl-lowlevellock.patch deleted file mode 100644 index 55fc78f..0000000 --- a/packages/glibc-ports/2.13/0010-nptl-lowlevellock.patch +++ /dev/null @@ -1,25 +0,0 @@ -fix build error on arm like on hppa: - -arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes -fPIC -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h -DPIC -DSHARED -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1 -In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21: -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private': -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM' -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function) - ---- - sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -+++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include /* Need THREAD_*, and header.*. */ - - #define FUTEX_WAIT 0 - #define FUTEX_WAKE 1 diff --git a/packages/glibc-ports/2.13/0011-fpu-cw-mips.patch b/packages/glibc-ports/2.13/0011-fpu-cw-mips.patch deleted file mode 100644 index 5cb8d71..0000000 --- a/packages/glibc-ports/2.13/0011-fpu-cw-mips.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html - ---- - sysdeps/mips/fpu_control.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/sysdeps/mips/fpu_control.h -+++ b/sysdeps/mips/fpu_control.h -@@ -86,7 +86,7 @@ - #define _FPU_RC_UP 0x2 - #define _FPU_RC_DOWN 0x3 - --#define _FPU_RESERVED 0xfe3c0000 /* Reserved bits in cw */ -+#define _FPU_RESERVED 0xfebc0000 /* Reserved bits in cw */ - - - /* The fdlibm code requires strict IEEE double precision arithmetic, diff --git a/packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch b/packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch deleted file mode 100644 index 9391e88..0000000 --- a/packages/glibc-ports/2.13/0012-support-hard-float-eabi.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- - sysdeps/arm/preconfigure | 2 +- - sysdeps/arm/shlib-versions | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/sysdeps/arm/preconfigure -+++ b/sysdeps/arm/preconfigure -@@ -2,7 +2,7 @@ - arm*) - base_machine=arm - case $config_os in -- linux-gnueabi) -+ linux-gnueabi*) - machine=arm/eabi/$machine - if [ "${CFLAGS+set}" != "set" ]; then - CFLAGS="-g -O2" ---- a/sysdeps/arm/shlib-versions -+++ b/sysdeps/arm/shlib-versions -@@ -1,4 +1,4 @@ --arm.*-.*-linux-gnueabi DEFAULT GLIBC_2.4 -+arm.*-.*-linux-gnueabi.* DEFAULT GLIBC_2.4 - --arm.*-.*-linux-gnueabi ld=ld-linux.so.3 -+arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3 - arm.*-.*-linux.* ld=ld-linux.so.2 diff --git a/packages/glibc-ports/2.13/chksum b/packages/glibc-ports/2.13/chksum deleted file mode 100644 index 44b7e8a..0000000 --- a/packages/glibc-ports/2.13/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 glibc-ports-2.13.tar.bz2 483f37cfdd619e81d8ca9e9d713944b5 -sha1 glibc-ports-2.13.tar.bz2 1cc771b4bf80f4b0872a342763f4aa4a9a9292cd -sha256 glibc-ports-2.13.tar.bz2 b11c4501ae929883447f409c31d65e82822b1c5693075a825a3d54612876ee5a -sha512 glibc-ports-2.13.tar.bz2 39ed578db363dab05e54d5272d3a8a0600493b91985c65a4d043b5a88d617ff46cca2d66d99ae69e92282d8f8a2357e79dcd5b0ae45b505497417d5137866ad6 -md5 glibc-ports-2.13.tar.gz 094e3c9b57da605917a780ab24575187 -sha1 glibc-ports-2.13.tar.gz 5460a86723be6cd7c63f115f9beca0baaa917d09 -sha256 glibc-ports-2.13.tar.gz 41cbdc05bd7b233464d649b59b34405e5bf3998522640b9f98f2c4eb91e87322 -sha512 glibc-ports-2.13.tar.gz 4b5fd8b803945f411b68dbf2c650b8f1c0611f158b1a58dcaa8e7fcafd0459e7b6dd0b923ab94f6997c5ff327001b19f396164e336ff1f36b17ee7e94fe74064 diff --git a/packages/glibc-ports/2.13/version.desc b/packages/glibc-ports/2.13/version.desc deleted file mode 100644 index d44e333..0000000 --- a/packages/glibc-ports/2.13/version.desc +++ /dev/null @@ -1 +0,0 @@ -archive_formats='.tar.bz2 .tar.gz' diff --git a/packages/glibc-ports/2.14.1/0000-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14.1/0000-Fix-ARM-build-with-GCC-trunk.patch deleted file mode 100644 index af8d28a..0000000 --- a/packages/glibc-ports/2.14.1/0000-Fix-ARM-build-with-GCC-trunk.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001 -From: Joseph Myers -Date: Tue, 20 May 2014 21:27:13 +0000 -Subject: [PATCH] Fix ARM build with GCC trunk. - -sysdeps/unix/sysv/linux/arm/unwind-resume.c and -sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static -variables that are written in C code but only read from toplevel asms. -Current GCC trunk now optimizes away such apparently write-only static -variables, so causing a build failure. This patch marks those -variables with __attribute_used__ to avoid that optimization. - -Tested that this fixes the build for ARM. - - * sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c - (libgcc_s_resume): Use __attribute_used__. - * sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume): - Likewise. ---- - sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c | 3 ++- - sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c | 3 ++- - sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | 3 ++- - sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | 3 ++- - 4 files changed, 8 insertions(+), 4 deletions(-) ---- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c -+++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c -@@ -23,7 +23,8 @@ - #include - - static void *libgcc_s_handle; --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *, - struct _Unwind_Context *); ---- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c -+++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c -@@ -21,7 +21,8 @@ - #include - #include - --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *, - struct _Unwind_Context *); ---- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c -+++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c -@@ -23,7 +23,8 @@ - #include - - static void *libgcc_s_handle; --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); - static _Unwind_Reason_Code (*libgcc_s_forcedunwind) ---- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c -+++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c -@@ -21,7 +21,8 @@ - #include - #include - --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); - diff --git a/packages/glibc-ports/2.14.1/0001-m68k-sys-user.patch b/packages/glibc-ports/2.14.1/0001-m68k-sys-user.patch deleted file mode 100644 index a03b08d..0000000 --- a/packages/glibc-ports/2.14.1/0001-m68k-sys-user.patch +++ /dev/null @@ -1,99 +0,0 @@ -copied from kernel as it is sanitized now - ---- - sysdeps/unix/sysv/linux/m68k/sys/user.h | 87 ++++++++++++++++++++++++++++++++ - 1 file changed, 87 insertions(+) - ---- a/sysdeps/unix/sysv/linux/m68k/sys/user.h -+++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h -@@ -1,3 +1,90 @@ -+#ifndef _SYS_USER_H -+#define _SYS_USER_H -+ -+/* Core file format: The core file is written in such a way that gdb -+ can understand it and provide useful information to the user (under -+ linux we use the 'trad-core' bfd). There are quite a number of -+ obstacles to being able to view the contents of the floating point -+ registers, and until these are solved you will not be able to view the -+ contents of them. Actually, you can read in the core file and look at -+ the contents of the user struct to find out what the floating point -+ registers contain. -+ The actual file contents are as follows: -+ UPAGE: 1 page consisting of a user struct that tells gdb what is present -+ in the file. Directly after this is a copy of the task_struct, which -+ is currently not used by gdb, but it may come in useful at some point. -+ All of the registers are stored as part of the upage. The upage should -+ always be only one page. -+ DATA: The data area is stored. We use current->end_text to -+ current->brk to pick up all of the user variables, plus any memory -+ that may have been malloced. No attempt is made to determine if a page -+ is demand-zero or if a page is totally unused, we just cover the entire -+ range. All of the addresses are rounded in such a way that an integral -+ number of pages is written. -+ STACK: We need the stack information in order to get a meaningful -+ backtrace. We need to write the data from (esp) to -+ current->start_stack, so we round each of these off in order to be able -+ to write an integer number of pages. -+ The minimum core file size is 3 pages, or 12288 bytes. -+*/ -+ -+struct user_m68kfp_struct { -+ unsigned long fpregs[8*3]; /* fp0-fp7 registers */ -+ unsigned long fpcntl[3]; /* fp control regs */ -+}; -+ -+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and -+ is still the layout used by user (the new pt_regs doesn't have -+ all registers). */ -+struct user_regs_struct { -+ long d1,d2,d3,d4,d5,d6,d7; -+ long a0,a1,a2,a3,a4,a5,a6; -+ long d0; -+ long usp; -+ long orig_d0; -+ short stkadj; -+ short sr; -+ long pc; -+ short fmtvec; -+ short __fill; -+}; -+ -+ -+/* When the kernel dumps core, it starts by dumping the user struct - -+ this will be used by gdb to figure out where the data and stack segments -+ are within the file, and what virtual addresses to use. */ -+struct user{ -+/* We start with the registers, to mimic the way that "memory" is returned -+ from the ptrace(3,...) function. */ -+ struct user_regs_struct regs; /* Where the registers are actually stored */ -+/* ptrace does not yet supply these. Someday.... */ -+ int u_fpvalid; /* True if math co-processor being used. */ -+ /* for this mess. Not yet used. */ -+ struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */ -+/* The rest of this junk is to help gdb figure out what goes where */ -+ unsigned long int u_tsize; /* Text segment size (pages). */ -+ unsigned long int u_dsize; /* Data segment size (pages). */ -+ unsigned long int u_ssize; /* Stack segment size (pages). */ -+ unsigned long start_code; /* Starting virtual address of text. */ -+ unsigned long start_stack; /* Starting virtual address of stack area. -+ This is actually the bottom of the stack, -+ the top of the stack is always found in the -+ esp register. */ -+ long int signal; /* Signal that caused the core dump. */ -+ int reserved; /* No longer used */ -+ struct user_regs_struct *u_ar0; -+ /* Used by gdb to help find the values for */ -+ /* the registers. */ -+ struct user_m68kfp_struct* u_fpstate; /* Math Co-processor pointer. */ -+ unsigned long magic; /* To uniquely identify a core file */ -+ char u_comm[32]; /* User command that was responsible */ -+}; -+#define NBPG 4096 -+#define UPAGES 1 -+#define HOST_TEXT_START_ADDR (u.start_code) -+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) -+ -+#endif - /* Copyright (C) 2008, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - diff --git a/packages/glibc-ports/2.14.1/0002-alpha-cache-shape.patch b/packages/glibc-ports/2.14.1/0002-alpha-cache-shape.patch deleted file mode 100644 index ca608bc..0000000 --- a/packages/glibc-ports/2.14.1/0002-alpha-cache-shape.patch +++ /dev/null @@ -1,16 +0,0 @@ -older verisons of glibc would build dl-sysdep as shared-only and dl-support as -static-only. alpha hooks in a cache variable via dl-auxv.h. newer versions of -glibc build dl-sysdep as both shared and static which means we now have symbol -duplication for static builds with dl-sysdep and dl-support. since dl-sysdep -is both shared/static, there is no point in hooking dl-support anymore, so we -can punt it. - ---- - sysdeps/unix/sysv/linux/alpha/dl-support.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/sysdeps/unix/sysv/linux/alpha/dl-support.c -+++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c -@@ -1,2 +1 @@ --#include "dl-auxv.h" - #include diff --git a/packages/glibc-ports/2.14.1/0003-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.14.1/0003-alpha-fix-gcc-4.1-warnings.patch deleted file mode 100644 index fef37a5..0000000 --- a/packages/glibc-ports/2.14.1/0003-alpha-fix-gcc-4.1-warnings.patch +++ /dev/null @@ -1,54 +0,0 @@ -2006-05-30 Falk Hueffner - - * sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture - to ev6 in assembly code. - -{standard input}: Assembler messages: -{standard input}:341: Error: macro requires $at register while noat in effect -{standard input}:374: Error: macro requires $at register while noat in effect -{standard input}:438: Error: macro requires $at register while noat in effect -{standard input}:471: Error: macro requires $at register while noat in effect -make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1 - -Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as. -I cannot really think of anything better than - - sysdeps/unix/sysv/linux/alpha/ioperm.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/sysdeps/unix/sysv/linux/alpha/ioperm.c -+++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c -@@ -178,13 +178,13 @@ - static inline void - stb_mb(unsigned char val, unsigned long addr) - { -- __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val)); -+ __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val)); - } - - static inline void - stw_mb(unsigned short val, unsigned long addr) - { -- __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val)); -+ __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val)); - } - - static inline void -@@ -356,7 +356,7 @@ - unsigned long int addr = dense_port_to_cpu_addr (port); - unsigned char r; - -- __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr)); -+ __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr)); - return r; - } - -@@ -366,7 +366,7 @@ - unsigned long int addr = dense_port_to_cpu_addr (port); - unsigned short r; - -- __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr)); -+ __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr)); - return r; - } - diff --git a/packages/glibc-ports/2.14.1/0004-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14.1/0004-alpha-fix-rtld-fPIC.patch deleted file mode 100644 index 53a0992..0000000 --- a/packages/glibc-ports/2.14.1/0004-alpha-fix-rtld-fPIC.patch +++ /dev/null @@ -1,19 +0,0 @@ -2009-05-26 Aurelien Jarno - - * sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag). - - sysdeps/alpha/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/sysdeps/alpha/Makefile -+++ b/sysdeps/alpha/Makefile -@@ -35,7 +35,8 @@ - - ifeq ($(subdir),elf) - # The ld.so startup code cannot use literals until it self-relocates. --CFLAGS-rtld.c = -mbuild-constants -+# It uses more than 64k for the small data area. -+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag) - endif - - # Build everything with full IEEE math support, and with dynamic rounding; diff --git a/packages/glibc-ports/2.14.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch deleted file mode 100644 index 855dde2..0000000 --- a/packages/glibc-ports/2.14.1/0005-arm-cirrus-ep93xx-maverick-crunch-fpu.patch +++ /dev/null @@ -1,366 +0,0 @@ -http://yann.poupet.free.fr/ep93xx/ -Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series - ---- - sysdeps/arm/bits/endian.h | 2 - - sysdeps/arm/fpu/__longjmp.S | 26 +++++++++++++ - sysdeps/arm/fpu/bits/fenv.h | 41 ++++++++++++++++++++ - sysdeps/arm/fpu/bits/setjmp.h | 4 ++ - sysdeps/arm/fpu/fegetround.c | 12 ++++++ - sysdeps/arm/fpu/fesetround.c | 16 ++++++++ - sysdeps/arm/fpu/fpu_control.h | 78 ++++++++++++++++++++++++++++++++++++++- - sysdeps/arm/fpu/jmpbuf-offsets.h | 4 ++ - sysdeps/arm/fpu/setjmp.S | 30 +++++++++++++++ - sysdeps/arm/gccframe.h | 4 ++ - sysdeps/arm/gmp-mparam.h | 2 - - 11 files changed, 216 insertions(+), 3 deletions(-) - ---- a/sysdeps/arm/bits/endian.h -+++ b/sysdeps/arm/bits/endian.h -@@ -12,7 +12,7 @@ - /* FPA floating point units are always big-endian, irrespective of the - CPU endianness. VFP floating point units use the same endianness - as the rest of the system. */ --#ifdef __VFP_FP__ -+#if defined __VFP_FP__ || defined __MAVERICK__ - #define __FLOAT_WORD_ORDER __BYTE_ORDER - #else - #define __FLOAT_WORD_ORDER __BIG_ENDIAN ---- a/sysdeps/arm/fpu/__longjmp.S -+++ b/sysdeps/arm/fpu/__longjmp.S -@@ -30,7 +30,33 @@ - movs r0, r1 /* get the return value in place */ - moveq r0, #1 /* can't let setjmp() return zero! */ - -+#ifdef __MAVERICK__ -+ cfldrd mvd4, [ip], #8 -+ nop -+ cfldrd mvd5, [ip], #8 -+ nop -+ cfldrd mvd6, [ip], #8 -+ nop -+ cfldrd mvd7, [ip], #8 -+ nop -+ cfldrd mvd8, [ip], #8 -+ nop -+ cfldrd mvd9, [ip], #8 -+ nop -+ cfldrd mvd10, [ip], #8 -+ nop -+ cfldrd mvd11, [ip], #8 -+ nop -+ cfldrd mvd12, [ip], #8 -+ nop -+ cfldrd mvd13, [ip], #8 -+ nop -+ cfldrd mvd14, [ip], #8 -+ nop -+ cfldrd mvd15, [ip], #8 -+#else - lfmfd f4, 4, [ip] ! /* load the floating point regs */ -+#endif - - LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc}) - END (__longjmp) ---- a/sysdeps/arm/fpu/bits/fenv.h -+++ b/sysdeps/arm/fpu/bits/fenv.h -@@ -20,6 +20,45 @@ - # error "Never use directly; include instead." - #endif - -+#if defined(__MAVERICK__) -+ -+/* Define bits representing exceptions in the FPU status word. */ -+enum -+ { -+ FE_INVALID = 1, -+#define FE_INVALID FE_INVALID -+ FE_OVERFLOW = 4, -+#define FE_OVERFLOW FE_OVERFLOW -+ FE_UNDERFLOW = 8, -+#define FE_UNDERFLOW FE_UNDERFLOW -+ FE_INEXACT = 16, -+#define FE_INEXACT FE_INEXACT -+ }; -+ -+/* Amount to shift by to convert an exception to a mask bit. */ -+#define FE_EXCEPT_SHIFT 5 -+ -+/* All supported exceptions. */ -+#define FE_ALL_EXCEPT \ -+ (FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT) -+ -+/* IEEE rounding modes. */ -+enum -+ { -+ FE_TONEAREST = 0, -+#define FE_TONEAREST FE_TONEAREST -+ FE_TOWARDZERO = 0x400, -+#define FE_TOWARDZERO FE_TOWARDZERO -+ FE_DOWNWARD = 0x800, -+#define FE_DOWNWARD FE_DOWNWARD -+ FE_UPWARD = 0xc00, -+#define FE_UPWARD FE_UPWARD -+ }; -+ -+#define FE_ROUND_MASK (FE_UPWARD) -+ -+#else /* FPA */ -+ - /* Define bits representing exceptions in the FPU status word. */ - enum - { -@@ -44,6 +83,8 @@ - modes exist, but you have to encode them in the actual instruction. */ - #define FE_TONEAREST 0 - -+#endif -+ - /* Type representing exception flags. */ - typedef unsigned long int fexcept_t; - ---- a/sysdeps/arm/fpu/bits/setjmp.h -+++ b/sysdeps/arm/fpu/bits/setjmp.h -@@ -28,7 +28,11 @@ - #ifndef _ASM - /* Jump buffer contains v1-v6, sl, fp, sp and pc. Other registers are not - saved. */ -+#ifdef __MAVERICK__ -+typedef int __jmp_buf[34]; -+#else - typedef int __jmp_buf[22]; - #endif -+#endif - - #endif ---- a/sysdeps/arm/fpu/fegetround.c -+++ b/sysdeps/arm/fpu/fegetround.c -@@ -18,9 +18,21 @@ - 02111-1307 USA. */ - - #include -+#include - - int - fegetround (void) - { -+#if defined(__MAVERICK__) -+ -+ unsigned long temp; -+ -+ _FPU_GETCW (temp); -+ return temp & FE_ROUND_MASK; -+ -+#else /* FPA */ -+ - return FE_TONEAREST; /* Easy. :-) */ -+ -+#endif - } ---- a/sysdeps/arm/fpu/fesetround.c -+++ b/sysdeps/arm/fpu/fesetround.c -@@ -18,12 +18,28 @@ - 02111-1307 USA. */ - - #include -+#include - - int - fesetround (int round) - { -+#if defined(__MAVERICK__) -+ unsigned long temp; -+ -+ if (round & ~FE_ROUND_MASK) -+ return 1; -+ -+ _FPU_GETCW (temp); -+ temp = (temp & ~FE_ROUND_MASK) | round; -+ _FPU_SETCW (temp); -+ return 0; -+ -+#else /* FPA */ -+ - /* We only support FE_TONEAREST, so there is no need for any work. */ - return (round == FE_TONEAREST)?0:1; -+ -+#endif - } - - libm_hidden_def (fesetround) ---- a/sysdeps/arm/fpu/fpu_control.h -+++ b/sysdeps/arm/fpu/fpu_control.h -@@ -1,5 +1,6 @@ - /* FPU control word definitions. ARM version. -- Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1997, 1998, 2000, 2005 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -20,6 +21,79 @@ - #ifndef _FPU_CONTROL_H - #define _FPU_CONTROL_H - -+#if defined(__MAVERICK__) -+ -+/* DSPSC register: (from EP9312 User's Guide) -+ * -+ * bits 31..29 - DAID -+ * bits 28..26 - HVID -+ * bits 25..24 - RSVD -+ * bit 23 - ISAT -+ * bit 22 - UI -+ * bit 21 - INT -+ * bit 20 - AEXC -+ * bits 19..18 - SAT -+ * bits 17..16 - FCC -+ * bit 15 - V -+ * bit 14 - FWDEN -+ * bit 13 - Invalid -+ * bit 12 - Denorm -+ * bits 11..10 - RM -+ * bits 9..5 - IXE, UFE, OFE, RSVD, IOE -+ * bits 4..0 - IX, UF, OF, RSVD, IO -+ */ -+ -+/* masking of interrupts */ -+#define _FPU_MASK_IM (1 << 5) /* invalid operation */ -+#define _FPU_MASK_ZM 0 /* divide by zero */ -+#define _FPU_MASK_OM (1 << 7) /* overflow */ -+#define _FPU_MASK_UM (1 << 8) /* underflow */ -+#define _FPU_MASK_PM (1 << 9) /* inexact */ -+#define _FPU_MASK_DM 0 /* denormalized operation */ -+ -+#define _FPU_RESERVED 0xfffff000 /* These bits are reserved. */ -+ -+#define _FPU_DEFAULT 0x00b00000 /* Default value. */ -+#define _FPU_IEEE 0x00b003a0 /* Default + exceptions enabled. */ -+ -+/* Type of the control word. */ -+typedef unsigned int fpu_control_t; -+ -+/* Macros for accessing the hardware control word. */ -+#define _FPU_GETCW(cw) ({ \ -+ register int __t1, __t2; \ -+ \ -+ __asm__ volatile ( \ -+ "cfmvr64l %1, mvdx0\n\t" \ -+ "cfmvr64h %2, mvdx0\n\t" \ -+ "cfmv32sc mvdx0, dspsc\n\t" \ -+ "cfmvr64l %0, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %1\n\t" \ -+ "cfmv64hr mvdx0, %2" \ -+ : "=r" (cw), "=r" (__t1), "=r" (__t2) \ -+ ); \ -+}) -+ -+#define _FPU_SETCW(cw) ({ \ -+ register int __t0, __t1, __t2; \ -+ \ -+ __asm__ volatile ( \ -+ "cfmvr64l %1, mvdx0\n\t" \ -+ "cfmvr64h %2, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %0\n\t" \ -+ "cfmvsc32 dspsc, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %1\n\t" \ -+ "cfmv64hr mvdx0, %2" \ -+ : "=r" (__t0), "=r" (__t1), "=r" (__t2) \ -+ : "0" (cw) \ -+ ); \ -+}) -+ -+/* Default control word set at startup. */ -+extern fpu_control_t __fpu_control; -+ -+#else /* FPA */ -+ - /* We have a slight terminology confusion here. On the ARM, the register - * we're interested in is actually the FPU status word - the FPU control - * word is something different (which is implementation-defined and only -@@ -99,4 +173,6 @@ - /* Default control word set at startup. */ - extern fpu_control_t __fpu_control; - -+#endif -+ - #endif /* _FPU_CONTROL_H */ ---- a/sysdeps/arm/fpu/jmpbuf-offsets.h -+++ b/sysdeps/arm/fpu/jmpbuf-offsets.h -@@ -17,4 +17,8 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#ifdef __MAVERICK__ -+#define __JMP_BUF_SP 32 -+#else - #define __JMP_BUF_SP 20 -+#endif ---- a/sysdeps/arm/fpu/setjmp.S -+++ b/sysdeps/arm/fpu/setjmp.S -@@ -24,11 +24,41 @@ - - ENTRY (__sigsetjmp) - /* Save registers */ -+#ifdef __MAVERICK__ -+ cfstrd mvd4, [r0], #8 -+ nop -+ cfstrd mvd5, [r0], #8 -+ nop -+ cfstrd mvd6, [r0], #8 -+ nop -+ cfstrd mvd7, [r0], #8 -+ nop -+ cfstrd mvd8, [r0], #8 -+ nop -+ cfstrd mvd9, [r0], #8 -+ nop -+ cfstrd mvd10, [r0], #8 -+ nop -+ cfstrd mvd11, [r0], #8 -+ nop -+ cfstrd mvd12, [r0], #8 -+ nop -+ cfstrd mvd13, [r0], #8 -+ nop -+ cfstrd mvd14, [r0], #8 -+ nop -+ cfstrd mvd15, [r0], #8 -+#else - sfmea f4, 4, [r0]! -+#endif - stmia r0, {v1-v6, sl, fp, sp, lr} - - /* Restore pointer to jmp_buf */ -+#ifdef __MAVERICK__ -+ sub r0, r0, #96 -+#else - sub r0, r0, #48 -+#endif - - /* Make a tail call to __sigjmp_save; it takes the same args. */ - B PLTJMP(C_SYMBOL_NAME(__sigjmp_save)) ---- a/sysdeps/arm/gccframe.h -+++ b/sysdeps/arm/gccframe.h -@@ -17,6 +17,10 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#ifdef __MAVERICK__ -+#define FIRST_PSEUDO_REGISTER 43 -+#else - #define FIRST_PSEUDO_REGISTER 27 -+#endif - - #include ---- a/sysdeps/arm/gmp-mparam.h -+++ b/sysdeps/arm/gmp-mparam.h -@@ -29,7 +29,7 @@ - #if defined(__ARMEB__) - # define IEEE_DOUBLE_MIXED_ENDIAN 0 - # define IEEE_DOUBLE_BIG_ENDIAN 1 --#elif defined(__VFP_FP__) -+#elif defined(__VFP_FP__) || defined(__MAVERICK__) - # define IEEE_DOUBLE_MIXED_ENDIAN 0 - # define IEEE_DOUBLE_BIG_ENDIAN 0 - #else diff --git a/packages/glibc-ports/2.14.1/0006-nptl-lowlevellock.patch b/packages/glibc-ports/2.14.1/0006-nptl-lowlevellock.patch deleted file mode 100644 index 55fc78f..0000000 --- a/packages/glibc-ports/2.14.1/0006-nptl-lowlevellock.patch +++ /dev/null @@ -1,25 +0,0 @@ -fix build error on arm like on hppa: - -arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes -fPIC -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h -DPIC -DSHARED -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1 -In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21: -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private': -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM' -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function) - ---- - sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -+++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include /* Need THREAD_*, and header.*. */ - - #define FUTEX_WAIT 0 - #define FUTEX_WAKE 1 diff --git a/packages/glibc-ports/2.14.1/0007-fpu-cw-mips.patch b/packages/glibc-ports/2.14.1/0007-fpu-cw-mips.patch deleted file mode 100644 index 5cb8d71..0000000 --- a/packages/glibc-ports/2.14.1/0007-fpu-cw-mips.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html - ---- - sysdeps/mips/fpu_control.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/sysdeps/mips/fpu_control.h -+++ b/sysdeps/mips/fpu_control.h -@@ -86,7 +86,7 @@ - #define _FPU_RC_UP 0x2 - #define _FPU_RC_DOWN 0x3 - --#define _FPU_RESERVED 0xfe3c0000 /* Reserved bits in cw */ -+#define _FPU_RESERVED 0xfebc0000 /* Reserved bits in cw */ - - - /* The fdlibm code requires strict IEEE double precision arithmetic, diff --git a/packages/glibc-ports/2.14.1/chksum b/packages/glibc-ports/2.14.1/chksum deleted file mode 100644 index 1078d5c..0000000 --- a/packages/glibc-ports/2.14.1/chksum +++ /dev/null @@ -1,12 +0,0 @@ -md5 glibc-ports-2.14.1.tar.xz 3b3afcb6b99fea9e3a2474cc4778ec88 -sha1 glibc-ports-2.14.1.tar.xz 5f87f269e5b8942eeb84c6b48145740ea7167729 -sha256 glibc-ports-2.14.1.tar.xz d093f2299213b42d9861cc9fa475278336cfdd1b9386bbd3e71d99e7412c59db -sha512 glibc-ports-2.14.1.tar.xz f6fe8330800ad96ca5b4f7a248f29fb17682cb00a97290df0a56b256146e557f29046c664eede83b22d09c9ef79810c3bcfea014128b793be0af6f7368ae4ac5 -md5 glibc-ports-2.14.1.tar.bz2 e2fb3ba179ed6b5720b94e158262e71a -sha1 glibc-ports-2.14.1.tar.bz2 f649bd5c0191315c92f6a4f46aaf7aa1bf82445d -sha256 glibc-ports-2.14.1.tar.bz2 1c830afb6d4aa166edaa09ec539580377ecbb16ba655d0aad6f5cb5a9a269aa9 -sha512 glibc-ports-2.14.1.tar.bz2 4ed18be51e2dec4395bf89701b32e443ba02e4e6b26ee1a72684a1f84ef302d58ed8b58f99e4e0ba3f539da0ade668de5881bb2b86fcd065d741448d9c129bae -md5 glibc-ports-2.14.1.tar.gz 2aa77ef5dd15df1d1d6dadd4e158ae33 -sha1 glibc-ports-2.14.1.tar.gz 6dedd87b589eed1de095634311d361cbb121678c -sha256 glibc-ports-2.14.1.tar.gz 956a5fc597e95d0684dc1b815ff73701d5fc745c6205ccd68e83a34377aa5106 -sha512 glibc-ports-2.14.1.tar.gz 3883c5f2f38debd2b415081378c0c2828c72a4ff0c98a442d832b9d8ceada7aa46cc28a097d99e912a49bb78a78ed314dea7c27b177268189232fe271e34b260 diff --git a/packages/glibc-ports/2.14.1/version.desc b/packages/glibc-ports/2.14.1/version.desc deleted file mode 100644 index e69de29..0000000 diff --git a/packages/glibc-ports/2.15/0000-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.15/0000-Fix-ARM-build-with-GCC-trunk.patch deleted file mode 100644 index af8d28a..0000000 --- a/packages/glibc-ports/2.15/0000-Fix-ARM-build-with-GCC-trunk.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001 -From: Joseph Myers -Date: Tue, 20 May 2014 21:27:13 +0000 -Subject: [PATCH] Fix ARM build with GCC trunk. - -sysdeps/unix/sysv/linux/arm/unwind-resume.c and -sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static -variables that are written in C code but only read from toplevel asms. -Current GCC trunk now optimizes away such apparently write-only static -variables, so causing a build failure. This patch marks those -variables with __attribute_used__ to avoid that optimization. - -Tested that this fixes the build for ARM. - - * sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c - (libgcc_s_resume): Use __attribute_used__. - * sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume): - Likewise. ---- - sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c | 3 ++- - sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c | 3 ++- - sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | 3 ++- - sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | 3 ++- - 4 files changed, 8 insertions(+), 4 deletions(-) ---- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c -+++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c -@@ -23,7 +23,8 @@ - #include - - static void *libgcc_s_handle; --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *, - struct _Unwind_Context *); ---- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c -+++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c -@@ -21,7 +21,8 @@ - #include - #include - --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *, - struct _Unwind_Context *); ---- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c -+++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c -@@ -23,7 +23,8 @@ - #include - - static void *libgcc_s_handle; --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); - static _Unwind_Reason_Code (*libgcc_s_forcedunwind) ---- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c -+++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c -@@ -21,7 +21,8 @@ - #include - #include - --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); - diff --git a/packages/glibc-ports/2.15/0001-libmemusage-link-failure.patch b/packages/glibc-ports/2.15/0001-libmemusage-link-failure.patch deleted file mode 100644 index 6e35f5a..0000000 --- a/packages/glibc-ports/2.15/0001-libmemusage-link-failure.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 2d80bda39073a35af4b904d27fa1511cd309b26f -Author: Nathan Sidwell -Date: Fri Jan 6 20:14:44 2012 +0000 - - Add ARM dependency of libmemusage.so on libc_nonshared.a. - ---- - sysdeps/arm/Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/sysdeps/arm/Makefile -+++ b/sysdeps/arm/Makefile -@@ -7,3 +7,8 @@ - ifeq ($(subdir),csu) - gen-as-const-headers += tlsdesc.sym - endif -+ -+# to pull in __aeabi_read_tp, needed for tls -+ifeq ($(subdir),malloc) -+$(objpfx)libmemusage.so: $(common-objpfx)libc_nonshared.a -+endif diff --git a/packages/glibc-ports/2.15/0002-m68k-sys-user.patch b/packages/glibc-ports/2.15/0002-m68k-sys-user.patch deleted file mode 100644 index a03b08d..0000000 --- a/packages/glibc-ports/2.15/0002-m68k-sys-user.patch +++ /dev/null @@ -1,99 +0,0 @@ -copied from kernel as it is sanitized now - ---- - sysdeps/unix/sysv/linux/m68k/sys/user.h | 87 ++++++++++++++++++++++++++++++++ - 1 file changed, 87 insertions(+) - ---- a/sysdeps/unix/sysv/linux/m68k/sys/user.h -+++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h -@@ -1,3 +1,90 @@ -+#ifndef _SYS_USER_H -+#define _SYS_USER_H -+ -+/* Core file format: The core file is written in such a way that gdb -+ can understand it and provide useful information to the user (under -+ linux we use the 'trad-core' bfd). There are quite a number of -+ obstacles to being able to view the contents of the floating point -+ registers, and until these are solved you will not be able to view the -+ contents of them. Actually, you can read in the core file and look at -+ the contents of the user struct to find out what the floating point -+ registers contain. -+ The actual file contents are as follows: -+ UPAGE: 1 page consisting of a user struct that tells gdb what is present -+ in the file. Directly after this is a copy of the task_struct, which -+ is currently not used by gdb, but it may come in useful at some point. -+ All of the registers are stored as part of the upage. The upage should -+ always be only one page. -+ DATA: The data area is stored. We use current->end_text to -+ current->brk to pick up all of the user variables, plus any memory -+ that may have been malloced. No attempt is made to determine if a page -+ is demand-zero or if a page is totally unused, we just cover the entire -+ range. All of the addresses are rounded in such a way that an integral -+ number of pages is written. -+ STACK: We need the stack information in order to get a meaningful -+ backtrace. We need to write the data from (esp) to -+ current->start_stack, so we round each of these off in order to be able -+ to write an integer number of pages. -+ The minimum core file size is 3 pages, or 12288 bytes. -+*/ -+ -+struct user_m68kfp_struct { -+ unsigned long fpregs[8*3]; /* fp0-fp7 registers */ -+ unsigned long fpcntl[3]; /* fp control regs */ -+}; -+ -+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and -+ is still the layout used by user (the new pt_regs doesn't have -+ all registers). */ -+struct user_regs_struct { -+ long d1,d2,d3,d4,d5,d6,d7; -+ long a0,a1,a2,a3,a4,a5,a6; -+ long d0; -+ long usp; -+ long orig_d0; -+ short stkadj; -+ short sr; -+ long pc; -+ short fmtvec; -+ short __fill; -+}; -+ -+ -+/* When the kernel dumps core, it starts by dumping the user struct - -+ this will be used by gdb to figure out where the data and stack segments -+ are within the file, and what virtual addresses to use. */ -+struct user{ -+/* We start with the registers, to mimic the way that "memory" is returned -+ from the ptrace(3,...) function. */ -+ struct user_regs_struct regs; /* Where the registers are actually stored */ -+/* ptrace does not yet supply these. Someday.... */ -+ int u_fpvalid; /* True if math co-processor being used. */ -+ /* for this mess. Not yet used. */ -+ struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */ -+/* The rest of this junk is to help gdb figure out what goes where */ -+ unsigned long int u_tsize; /* Text segment size (pages). */ -+ unsigned long int u_dsize; /* Data segment size (pages). */ -+ unsigned long int u_ssize; /* Stack segment size (pages). */ -+ unsigned long start_code; /* Starting virtual address of text. */ -+ unsigned long start_stack; /* Starting virtual address of stack area. -+ This is actually the bottom of the stack, -+ the top of the stack is always found in the -+ esp register. */ -+ long int signal; /* Signal that caused the core dump. */ -+ int reserved; /* No longer used */ -+ struct user_regs_struct *u_ar0; -+ /* Used by gdb to help find the values for */ -+ /* the registers. */ -+ struct user_m68kfp_struct* u_fpstate; /* Math Co-processor pointer. */ -+ unsigned long magic; /* To uniquely identify a core file */ -+ char u_comm[32]; /* User command that was responsible */ -+}; -+#define NBPG 4096 -+#define UPAGES 1 -+#define HOST_TEXT_START_ADDR (u.start_code) -+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) -+ -+#endif - /* Copyright (C) 2008, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - diff --git a/packages/glibc-ports/2.15/0003-alpha-cache-shape.patch b/packages/glibc-ports/2.15/0003-alpha-cache-shape.patch deleted file mode 100644 index ca608bc..0000000 --- a/packages/glibc-ports/2.15/0003-alpha-cache-shape.patch +++ /dev/null @@ -1,16 +0,0 @@ -older verisons of glibc would build dl-sysdep as shared-only and dl-support as -static-only. alpha hooks in a cache variable via dl-auxv.h. newer versions of -glibc build dl-sysdep as both shared and static which means we now have symbol -duplication for static builds with dl-sysdep and dl-support. since dl-sysdep -is both shared/static, there is no point in hooking dl-support anymore, so we -can punt it. - ---- - sysdeps/unix/sysv/linux/alpha/dl-support.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/sysdeps/unix/sysv/linux/alpha/dl-support.c -+++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c -@@ -1,2 +1 @@ --#include "dl-auxv.h" - #include diff --git a/packages/glibc-ports/2.15/0004-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.15/0004-alpha-fix-gcc-4.1-warnings.patch deleted file mode 100644 index fef37a5..0000000 --- a/packages/glibc-ports/2.15/0004-alpha-fix-gcc-4.1-warnings.patch +++ /dev/null @@ -1,54 +0,0 @@ -2006-05-30 Falk Hueffner - - * sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture - to ev6 in assembly code. - -{standard input}: Assembler messages: -{standard input}:341: Error: macro requires $at register while noat in effect -{standard input}:374: Error: macro requires $at register while noat in effect -{standard input}:438: Error: macro requires $at register while noat in effect -{standard input}:471: Error: macro requires $at register while noat in effect -make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1 - -Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as. -I cannot really think of anything better than - - sysdeps/unix/sysv/linux/alpha/ioperm.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/sysdeps/unix/sysv/linux/alpha/ioperm.c -+++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c -@@ -178,13 +178,13 @@ - static inline void - stb_mb(unsigned char val, unsigned long addr) - { -- __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val)); -+ __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val)); - } - - static inline void - stw_mb(unsigned short val, unsigned long addr) - { -- __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val)); -+ __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val)); - } - - static inline void -@@ -356,7 +356,7 @@ - unsigned long int addr = dense_port_to_cpu_addr (port); - unsigned char r; - -- __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr)); -+ __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr)); - return r; - } - -@@ -366,7 +366,7 @@ - unsigned long int addr = dense_port_to_cpu_addr (port); - unsigned short r; - -- __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr)); -+ __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr)); - return r; - } - diff --git a/packages/glibc-ports/2.15/0005-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.15/0005-alpha-fix-rtld-fPIC.patch deleted file mode 100644 index 53a0992..0000000 --- a/packages/glibc-ports/2.15/0005-alpha-fix-rtld-fPIC.patch +++ /dev/null @@ -1,19 +0,0 @@ -2009-05-26 Aurelien Jarno - - * sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag). - - sysdeps/alpha/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/sysdeps/alpha/Makefile -+++ b/sysdeps/alpha/Makefile -@@ -35,7 +35,8 @@ - - ifeq ($(subdir),elf) - # The ld.so startup code cannot use literals until it self-relocates. --CFLAGS-rtld.c = -mbuild-constants -+# It uses more than 64k for the small data area. -+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag) - endif - - # Build everything with full IEEE math support, and with dynamic rounding; diff --git a/packages/glibc-ports/2.15/0006-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.15/0006-arm-cirrus-ep93xx-maverick-crunch-fpu.patch deleted file mode 100644 index 855dde2..0000000 --- a/packages/glibc-ports/2.15/0006-arm-cirrus-ep93xx-maverick-crunch-fpu.patch +++ /dev/null @@ -1,366 +0,0 @@ -http://yann.poupet.free.fr/ep93xx/ -Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series - ---- - sysdeps/arm/bits/endian.h | 2 - - sysdeps/arm/fpu/__longjmp.S | 26 +++++++++++++ - sysdeps/arm/fpu/bits/fenv.h | 41 ++++++++++++++++++++ - sysdeps/arm/fpu/bits/setjmp.h | 4 ++ - sysdeps/arm/fpu/fegetround.c | 12 ++++++ - sysdeps/arm/fpu/fesetround.c | 16 ++++++++ - sysdeps/arm/fpu/fpu_control.h | 78 ++++++++++++++++++++++++++++++++++++++- - sysdeps/arm/fpu/jmpbuf-offsets.h | 4 ++ - sysdeps/arm/fpu/setjmp.S | 30 +++++++++++++++ - sysdeps/arm/gccframe.h | 4 ++ - sysdeps/arm/gmp-mparam.h | 2 - - 11 files changed, 216 insertions(+), 3 deletions(-) - ---- a/sysdeps/arm/bits/endian.h -+++ b/sysdeps/arm/bits/endian.h -@@ -12,7 +12,7 @@ - /* FPA floating point units are always big-endian, irrespective of the - CPU endianness. VFP floating point units use the same endianness - as the rest of the system. */ --#ifdef __VFP_FP__ -+#if defined __VFP_FP__ || defined __MAVERICK__ - #define __FLOAT_WORD_ORDER __BYTE_ORDER - #else - #define __FLOAT_WORD_ORDER __BIG_ENDIAN ---- a/sysdeps/arm/fpu/__longjmp.S -+++ b/sysdeps/arm/fpu/__longjmp.S -@@ -30,7 +30,33 @@ - movs r0, r1 /* get the return value in place */ - moveq r0, #1 /* can't let setjmp() return zero! */ - -+#ifdef __MAVERICK__ -+ cfldrd mvd4, [ip], #8 -+ nop -+ cfldrd mvd5, [ip], #8 -+ nop -+ cfldrd mvd6, [ip], #8 -+ nop -+ cfldrd mvd7, [ip], #8 -+ nop -+ cfldrd mvd8, [ip], #8 -+ nop -+ cfldrd mvd9, [ip], #8 -+ nop -+ cfldrd mvd10, [ip], #8 -+ nop -+ cfldrd mvd11, [ip], #8 -+ nop -+ cfldrd mvd12, [ip], #8 -+ nop -+ cfldrd mvd13, [ip], #8 -+ nop -+ cfldrd mvd14, [ip], #8 -+ nop -+ cfldrd mvd15, [ip], #8 -+#else - lfmfd f4, 4, [ip] ! /* load the floating point regs */ -+#endif - - LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc}) - END (__longjmp) ---- a/sysdeps/arm/fpu/bits/fenv.h -+++ b/sysdeps/arm/fpu/bits/fenv.h -@@ -20,6 +20,45 @@ - # error "Never use directly; include instead." - #endif - -+#if defined(__MAVERICK__) -+ -+/* Define bits representing exceptions in the FPU status word. */ -+enum -+ { -+ FE_INVALID = 1, -+#define FE_INVALID FE_INVALID -+ FE_OVERFLOW = 4, -+#define FE_OVERFLOW FE_OVERFLOW -+ FE_UNDERFLOW = 8, -+#define FE_UNDERFLOW FE_UNDERFLOW -+ FE_INEXACT = 16, -+#define FE_INEXACT FE_INEXACT -+ }; -+ -+/* Amount to shift by to convert an exception to a mask bit. */ -+#define FE_EXCEPT_SHIFT 5 -+ -+/* All supported exceptions. */ -+#define FE_ALL_EXCEPT \ -+ (FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT) -+ -+/* IEEE rounding modes. */ -+enum -+ { -+ FE_TONEAREST = 0, -+#define FE_TONEAREST FE_TONEAREST -+ FE_TOWARDZERO = 0x400, -+#define FE_TOWARDZERO FE_TOWARDZERO -+ FE_DOWNWARD = 0x800, -+#define FE_DOWNWARD FE_DOWNWARD -+ FE_UPWARD = 0xc00, -+#define FE_UPWARD FE_UPWARD -+ }; -+ -+#define FE_ROUND_MASK (FE_UPWARD) -+ -+#else /* FPA */ -+ - /* Define bits representing exceptions in the FPU status word. */ - enum - { -@@ -44,6 +83,8 @@ - modes exist, but you have to encode them in the actual instruction. */ - #define FE_TONEAREST 0 - -+#endif -+ - /* Type representing exception flags. */ - typedef unsigned long int fexcept_t; - ---- a/sysdeps/arm/fpu/bits/setjmp.h -+++ b/sysdeps/arm/fpu/bits/setjmp.h -@@ -28,7 +28,11 @@ - #ifndef _ASM - /* Jump buffer contains v1-v6, sl, fp, sp and pc. Other registers are not - saved. */ -+#ifdef __MAVERICK__ -+typedef int __jmp_buf[34]; -+#else - typedef int __jmp_buf[22]; - #endif -+#endif - - #endif ---- a/sysdeps/arm/fpu/fegetround.c -+++ b/sysdeps/arm/fpu/fegetround.c -@@ -18,9 +18,21 @@ - 02111-1307 USA. */ - - #include -+#include - - int - fegetround (void) - { -+#if defined(__MAVERICK__) -+ -+ unsigned long temp; -+ -+ _FPU_GETCW (temp); -+ return temp & FE_ROUND_MASK; -+ -+#else /* FPA */ -+ - return FE_TONEAREST; /* Easy. :-) */ -+ -+#endif - } ---- a/sysdeps/arm/fpu/fesetround.c -+++ b/sysdeps/arm/fpu/fesetround.c -@@ -18,12 +18,28 @@ - 02111-1307 USA. */ - - #include -+#include - - int - fesetround (int round) - { -+#if defined(__MAVERICK__) -+ unsigned long temp; -+ -+ if (round & ~FE_ROUND_MASK) -+ return 1; -+ -+ _FPU_GETCW (temp); -+ temp = (temp & ~FE_ROUND_MASK) | round; -+ _FPU_SETCW (temp); -+ return 0; -+ -+#else /* FPA */ -+ - /* We only support FE_TONEAREST, so there is no need for any work. */ - return (round == FE_TONEAREST)?0:1; -+ -+#endif - } - - libm_hidden_def (fesetround) ---- a/sysdeps/arm/fpu/fpu_control.h -+++ b/sysdeps/arm/fpu/fpu_control.h -@@ -1,5 +1,6 @@ - /* FPU control word definitions. ARM version. -- Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1997, 1998, 2000, 2005 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -20,6 +21,79 @@ - #ifndef _FPU_CONTROL_H - #define _FPU_CONTROL_H - -+#if defined(__MAVERICK__) -+ -+/* DSPSC register: (from EP9312 User's Guide) -+ * -+ * bits 31..29 - DAID -+ * bits 28..26 - HVID -+ * bits 25..24 - RSVD -+ * bit 23 - ISAT -+ * bit 22 - UI -+ * bit 21 - INT -+ * bit 20 - AEXC -+ * bits 19..18 - SAT -+ * bits 17..16 - FCC -+ * bit 15 - V -+ * bit 14 - FWDEN -+ * bit 13 - Invalid -+ * bit 12 - Denorm -+ * bits 11..10 - RM -+ * bits 9..5 - IXE, UFE, OFE, RSVD, IOE -+ * bits 4..0 - IX, UF, OF, RSVD, IO -+ */ -+ -+/* masking of interrupts */ -+#define _FPU_MASK_IM (1 << 5) /* invalid operation */ -+#define _FPU_MASK_ZM 0 /* divide by zero */ -+#define _FPU_MASK_OM (1 << 7) /* overflow */ -+#define _FPU_MASK_UM (1 << 8) /* underflow */ -+#define _FPU_MASK_PM (1 << 9) /* inexact */ -+#define _FPU_MASK_DM 0 /* denormalized operation */ -+ -+#define _FPU_RESERVED 0xfffff000 /* These bits are reserved. */ -+ -+#define _FPU_DEFAULT 0x00b00000 /* Default value. */ -+#define _FPU_IEEE 0x00b003a0 /* Default + exceptions enabled. */ -+ -+/* Type of the control word. */ -+typedef unsigned int fpu_control_t; -+ -+/* Macros for accessing the hardware control word. */ -+#define _FPU_GETCW(cw) ({ \ -+ register int __t1, __t2; \ -+ \ -+ __asm__ volatile ( \ -+ "cfmvr64l %1, mvdx0\n\t" \ -+ "cfmvr64h %2, mvdx0\n\t" \ -+ "cfmv32sc mvdx0, dspsc\n\t" \ -+ "cfmvr64l %0, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %1\n\t" \ -+ "cfmv64hr mvdx0, %2" \ -+ : "=r" (cw), "=r" (__t1), "=r" (__t2) \ -+ ); \ -+}) -+ -+#define _FPU_SETCW(cw) ({ \ -+ register int __t0, __t1, __t2; \ -+ \ -+ __asm__ volatile ( \ -+ "cfmvr64l %1, mvdx0\n\t" \ -+ "cfmvr64h %2, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %0\n\t" \ -+ "cfmvsc32 dspsc, mvdx0\n\t" \ -+ "cfmv64lr mvdx0, %1\n\t" \ -+ "cfmv64hr mvdx0, %2" \ -+ : "=r" (__t0), "=r" (__t1), "=r" (__t2) \ -+ : "0" (cw) \ -+ ); \ -+}) -+ -+/* Default control word set at startup. */ -+extern fpu_control_t __fpu_control; -+ -+#else /* FPA */ -+ - /* We have a slight terminology confusion here. On the ARM, the register - * we're interested in is actually the FPU status word - the FPU control - * word is something different (which is implementation-defined and only -@@ -99,4 +173,6 @@ - /* Default control word set at startup. */ - extern fpu_control_t __fpu_control; - -+#endif -+ - #endif /* _FPU_CONTROL_H */ ---- a/sysdeps/arm/fpu/jmpbuf-offsets.h -+++ b/sysdeps/arm/fpu/jmpbuf-offsets.h -@@ -17,4 +17,8 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#ifdef __MAVERICK__ -+#define __JMP_BUF_SP 32 -+#else - #define __JMP_BUF_SP 20 -+#endif ---- a/sysdeps/arm/fpu/setjmp.S -+++ b/sysdeps/arm/fpu/setjmp.S -@@ -24,11 +24,41 @@ - - ENTRY (__sigsetjmp) - /* Save registers */ -+#ifdef __MAVERICK__ -+ cfstrd mvd4, [r0], #8 -+ nop -+ cfstrd mvd5, [r0], #8 -+ nop -+ cfstrd mvd6, [r0], #8 -+ nop -+ cfstrd mvd7, [r0], #8 -+ nop -+ cfstrd mvd8, [r0], #8 -+ nop -+ cfstrd mvd9, [r0], #8 -+ nop -+ cfstrd mvd10, [r0], #8 -+ nop -+ cfstrd mvd11, [r0], #8 -+ nop -+ cfstrd mvd12, [r0], #8 -+ nop -+ cfstrd mvd13, [r0], #8 -+ nop -+ cfstrd mvd14, [r0], #8 -+ nop -+ cfstrd mvd15, [r0], #8 -+#else - sfmea f4, 4, [r0]! -+#endif - stmia r0, {v1-v6, sl, fp, sp, lr} - - /* Restore pointer to jmp_buf */ -+#ifdef __MAVERICK__ -+ sub r0, r0, #96 -+#else - sub r0, r0, #48 -+#endif - - /* Make a tail call to __sigjmp_save; it takes the same args. */ - B PLTJMP(C_SYMBOL_NAME(__sigjmp_save)) ---- a/sysdeps/arm/gccframe.h -+++ b/sysdeps/arm/gccframe.h -@@ -17,6 +17,10 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#ifdef __MAVERICK__ -+#define FIRST_PSEUDO_REGISTER 43 -+#else - #define FIRST_PSEUDO_REGISTER 27 -+#endif - - #include ---- a/sysdeps/arm/gmp-mparam.h -+++ b/sysdeps/arm/gmp-mparam.h -@@ -29,7 +29,7 @@ - #if defined(__ARMEB__) - # define IEEE_DOUBLE_MIXED_ENDIAN 0 - # define IEEE_DOUBLE_BIG_ENDIAN 1 --#elif defined(__VFP_FP__) -+#elif defined(__VFP_FP__) || defined(__MAVERICK__) - # define IEEE_DOUBLE_MIXED_ENDIAN 0 - # define IEEE_DOUBLE_BIG_ENDIAN 0 - #else diff --git a/packages/glibc-ports/2.15/0007-nptl-lowlevellock.patch b/packages/glibc-ports/2.15/0007-nptl-lowlevellock.patch deleted file mode 100644 index 55fc78f..0000000 --- a/packages/glibc-ports/2.15/0007-nptl-lowlevellock.patch +++ /dev/null @@ -1,25 +0,0 @@ -fix build error on arm like on hppa: - -arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes -fPIC -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h -DPIC -DSHARED -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1 -In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21: -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private': -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM' -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function) - ---- - sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -+++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include /* Need THREAD_*, and header.*. */ - - #define FUTEX_WAIT 0 - #define FUTEX_WAKE 1 diff --git a/packages/glibc-ports/2.15/0008-fpu-cw-mips.patch b/packages/glibc-ports/2.15/0008-fpu-cw-mips.patch deleted file mode 100644 index 5cb8d71..0000000 --- a/packages/glibc-ports/2.15/0008-fpu-cw-mips.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html - ---- - sysdeps/mips/fpu_control.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/sysdeps/mips/fpu_control.h -+++ b/sysdeps/mips/fpu_control.h -@@ -86,7 +86,7 @@ - #define _FPU_RC_UP 0x2 - #define _FPU_RC_DOWN 0x3 - --#define _FPU_RESERVED 0xfe3c0000 /* Reserved bits in cw */ -+#define _FPU_RESERVED 0xfebc0000 /* Reserved bits in cw */ - - - /* The fdlibm code requires strict IEEE double precision arithmetic, diff --git a/packages/glibc-ports/2.15/chksum b/packages/glibc-ports/2.15/chksum deleted file mode 100644 index 2df7942..0000000 --- a/packages/glibc-ports/2.15/chksum +++ /dev/null @@ -1,12 +0,0 @@ -md5 glibc-ports-2.15.tar.xz fef73c8b7885b02ec5f7ce8fa00ba30c -sha1 glibc-ports-2.15.tar.xz 65c4c239f703cc63a1fa65aa7b32ab13f833d99e -sha256 glibc-ports-2.15.tar.xz fcc271fcc3a808bf0f3aa1d144bc39b8d0d5f730aed6e206b883961515f0d1b9 -sha512 glibc-ports-2.15.tar.xz fc3c80a9a7ede0f35054e5be043fff4b967e6ef6678f42e617dd1dd498920edb4e4c785cf8e3cd97fc2914a35a892e0fd7e1aab24f0c3c8d207765a131bf3744 -md5 glibc-ports-2.15.tar.bz2 56efe246ce89f16a52792cea9224823c -sha1 glibc-ports-2.15.tar.bz2 493f73dae7479168049cc0113933fad64daef6c8 -sha256 glibc-ports-2.15.tar.bz2 d5108f2730b1cddbf882271c3ed591b950b1cf1045ec7ddc0f3e5ef4cccd1a6c -sha512 glibc-ports-2.15.tar.bz2 c9c1e64ac54144a93faa78f5c1bb950615f4cd12c2014b63d85db2a2e155c9e0a64922af2e3c5df3bde914b3606f82a82f61e41089b4ab05f8dbf1b521ed0004 -md5 glibc-ports-2.15.tar.gz ca5ca51ad4fe21cebb680245e3e331da -sha1 glibc-ports-2.15.tar.gz 06d101b9b8dd7eeff716ee2984ce4a689eafeaae -sha256 glibc-ports-2.15.tar.gz 06014ee432941e3c14ea5deb44060c413715aa8d1e39d2b662b112da112f0be8 -sha512 glibc-ports-2.15.tar.gz ef58da21aa75e2052799f745f55856993a0f7a1a4bf03d7caeedf7b382745e5d4837a9d435375f3fb50b391bddfcee65c2b869f192fd825e12c4f80920a6548a diff --git a/packages/glibc-ports/2.15/version.desc b/packages/glibc-ports/2.15/version.desc deleted file mode 100644 index e69de29..0000000 diff --git a/packages/glibc-ports/2.16.0/0000-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.16.0/0000-Fix-ARM-build-with-GCC-trunk.patch deleted file mode 100644 index 2b56075..0000000 --- a/packages/glibc-ports/2.16.0/0000-Fix-ARM-build-with-GCC-trunk.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001 -From: Joseph Myers -Date: Tue, 20 May 2014 21:27:13 +0000 -Subject: [PATCH] Fix ARM build with GCC trunk. - -sysdeps/unix/sysv/linux/arm/unwind-resume.c and -sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static -variables that are written in C code but only read from toplevel asms. -Current GCC trunk now optimizes away such apparently write-only static -variables, so causing a build failure. This patch marks those -variables with __attribute_used__ to avoid that optimization. - -Tested that this fixes the build for ARM. - - * sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c - (libgcc_s_resume): Use __attribute_used__. - * sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume): - Likewise. ---- - sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c | 3 ++- - sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - ---- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c -+++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c -@@ -22,7 +22,8 @@ - #include - - static void *libgcc_s_handle; --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); - static _Unwind_Reason_Code (*libgcc_s_forcedunwind) ---- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c -+++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c -@@ -20,7 +20,8 @@ - #include - #include - --static void (*libgcc_s_resume) (struct _Unwind_Exception *exc); -+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) -+ __attribute_used__; - static _Unwind_Reason_Code (*libgcc_s_personality) - (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *); - diff --git a/packages/glibc-ports/2.16.0/0001-m68k-sys-user.patch b/packages/glibc-ports/2.16.0/0001-m68k-sys-user.patch deleted file mode 100644 index a03b08d..0000000 --- a/packages/glibc-ports/2.16.0/0001-m68k-sys-user.patch +++ /dev/null @@ -1,99 +0,0 @@ -copied from kernel as it is sanitized now - ---- - sysdeps/unix/sysv/linux/m68k/sys/user.h | 87 ++++++++++++++++++++++++++++++++ - 1 file changed, 87 insertions(+) - ---- a/sysdeps/unix/sysv/linux/m68k/sys/user.h -+++ b/sysdeps/unix/sysv/linux/m68k/sys/user.h -@@ -1,3 +1,90 @@ -+#ifndef _SYS_USER_H -+#define _SYS_USER_H -+ -+/* Core file format: The core file is written in such a way that gdb -+ can understand it and provide useful information to the user (under -+ linux we use the 'trad-core' bfd). There are quite a number of -+ obstacles to being able to view the contents of the floating point -+ registers, and until these are solved you will not be able to view the -+ contents of them. Actually, you can read in the core file and look at -+ the contents of the user struct to find out what the floating point -+ registers contain. -+ The actual file contents are as follows: -+ UPAGE: 1 page consisting of a user struct that tells gdb what is present -+ in the file. Directly after this is a copy of the task_struct, which -+ is currently not used by gdb, but it may come in useful at some point. -+ All of the registers are stored as part of the upage. The upage should -+ always be only one page. -+ DATA: The data area is stored. We use current->end_text to -+ current->brk to pick up all of the user variables, plus any memory -+ that may have been malloced. No attempt is made to determine if a page -+ is demand-zero or if a page is totally unused, we just cover the entire -+ range. All of the addresses are rounded in such a way that an integral -+ number of pages is written. -+ STACK: We need the stack information in order to get a meaningful -+ backtrace. We need to write the data from (esp) to -+ current->start_stack, so we round each of these off in order to be able -+ to write an integer number of pages. -+ The minimum core file size is 3 pages, or 12288 bytes. -+*/ -+ -+struct user_m68kfp_struct { -+ unsigned long fpregs[8*3]; /* fp0-fp7 registers */ -+ unsigned long fpcntl[3]; /* fp control regs */ -+}; -+ -+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and -+ is still the layout used by user (the new pt_regs doesn't have -+ all registers). */ -+struct user_regs_struct { -+ long d1,d2,d3,d4,d5,d6,d7; -+ long a0,a1,a2,a3,a4,a5,a6; -+ long d0; -+ long usp; -+ long orig_d0; -+ short stkadj; -+ short sr; -+ long pc; -+ short fmtvec; -+ short __fill; -+}; -+ -+ -+/* When the kernel dumps core, it starts by dumping the user struct - -+ this will be used by gdb to figure out where the data and stack segments -+ are within the file, and what virtual addresses to use. */ -+struct user{ -+/* We start with the registers, to mimic the way that "memory" is returned -+ from the ptrace(3,...) function. */ -+ struct user_regs_struct regs; /* Where the registers are actually stored */ -+/* ptrace does not yet supply these. Someday.... */ -+ int u_fpvalid; /* True if math co-processor being used. */ -+ /* for this mess. Not yet used. */ -+ struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */ -+/* The rest of this junk is to help gdb figure out what goes where */ -+ unsigned long int u_tsize; /* Text segment size (pages). */ -+ unsigned long int u_dsize; /* Data segment size (pages). */ -+ unsigned long int u_ssize; /* Stack segment size (pages). */ -+ unsigned long start_code; /* Starting virtual address of text. */ -+ unsigned long start_stack; /* Starting virtual address of stack area. -+ This is actually the bottom of the stack, -+ the top of the stack is always found in the -+ esp register. */ -+ long int signal; /* Signal that caused the core dump. */ -+ int reserved; /* No longer used */ -+ struct user_regs_struct *u_ar0; -+ /* Used by gdb to help find the values for */ -+ /* the registers. */ -+ struct user_m68kfp_struct* u_fpstate; /* Math Co-processor pointer. */ -+ unsigned long magic; /* To uniquely identify a core file */ -+ char u_comm[32]; /* User command that was responsible */ -+}; -+#define NBPG 4096 -+#define UPAGES 1 -+#define HOST_TEXT_START_ADDR (u.start_code) -+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) -+ -+#endif - /* Copyright (C) 2008, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - diff --git a/packages/glibc-ports/2.16.0/0002-alpha-cache-shape.patch b/packages/glibc-ports/2.16.0/0002-alpha-cache-shape.patch deleted file mode 100644 index ca608bc..0000000 --- a/packages/glibc-ports/2.16.0/0002-alpha-cache-shape.patch +++ /dev/null @@ -1,16 +0,0 @@ -older verisons of glibc would build dl-sysdep as shared-only and dl-support as -static-only. alpha hooks in a cache variable via dl-auxv.h. newer versions of -glibc build dl-sysdep as both shared and static which means we now have symbol -duplication for static builds with dl-sysdep and dl-support. since dl-sysdep -is both shared/static, there is no point in hooking dl-support anymore, so we -can punt it. - ---- - sysdeps/unix/sysv/linux/alpha/dl-support.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/sysdeps/unix/sysv/linux/alpha/dl-support.c -+++ b/sysdeps/unix/sysv/linux/alpha/dl-support.c -@@ -1,2 +1 @@ --#include "dl-auxv.h" - #include diff --git a/packages/glibc-ports/2.16.0/0003-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.16.0/0003-alpha-fix-gcc-4.1-warnings.patch deleted file mode 100644 index 0e1d592..0000000 --- a/packages/glibc-ports/2.16.0/0003-alpha-fix-gcc-4.1-warnings.patch +++ /dev/null @@ -1,54 +0,0 @@ -2006-05-30 Falk Hueffner - - * sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture - to ev6 in assembly code. - -{standard input}: Assembler messages: -{standard input}:341: Error: macro requires $at register while noat in effect -{standard input}:374: Error: macro requires $at register while noat in effect -{standard input}:438: Error: macro requires $at register while noat in effect -{standard input}:471: Error: macro requires $at register while noat in effect -make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1 - -Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as. -I cannot really think of anything better than - - sysdeps/unix/sysv/linux/alpha/ioperm.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/sysdeps/unix/sysv/linux/alpha/ioperm.c -+++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c -@@ -177,13 +177,13 @@ - static inline void - stb_mb(unsigned char val, unsigned long addr) - { -- __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val)); -+ __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val)); - } - - static inline void - stw_mb(unsigned short val, unsigned long addr) - { -- __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val)); -+ __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val)); - } - - static inline void -@@ -355,7 +355,7 @@ - unsigned long int addr = dense_port_to_cpu_addr (port); - unsigned char r; - -- __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr)); -+ __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr)); - return r; - } - -@@ -365,7 +365,7 @@ - unsigned long int addr = dense_port_to_cpu_addr (port); - unsigned short r; - -- __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr)); -+ __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr)); - return r; - } - diff --git a/packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch deleted file mode 100644 index bc2ae45..0000000 --- a/packages/glibc-ports/2.16.0/0004-alpha-fix-rtld-fPIC.patch +++ /dev/null @@ -1,19 +0,0 @@ -2009-05-26 Aurelien Jarno - - * sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag). - - sysdeps/alpha/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/sysdeps/alpha/Makefile -+++ b/sysdeps/alpha/Makefile -@@ -34,7 +34,8 @@ - - ifeq ($(subdir),elf) - # The ld.so startup code cannot use literals until it self-relocates. --CFLAGS-rtld.c = -mbuild-constants -+# It uses more than 64k for the small data area. -+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag) - endif - - ifeq ($(subdir),math) diff --git a/packages/glibc-ports/2.16.0/0005-nptl-lowlevellock.patch b/packages/glibc-ports/2.16.0/0005-nptl-lowlevellock.patch deleted file mode 100644 index 3899a0a..0000000 --- a/packages/glibc-ports/2.16.0/0005-nptl-lowlevellock.patch +++ /dev/null @@ -1,25 +0,0 @@ -fix build error on arm like on hppa: - -arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes -fPIC -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h -DPIC -DSHARED -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1 -In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21: -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private': -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM' -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.) -../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function) - ---- - sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -+++ b/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include /* Need THREAD_*, and header.*. */ - - #define FUTEX_WAIT 0 - #define FUTEX_WAKE 1 diff --git a/packages/glibc-ports/2.16.0/0006-fpu-cw-mips.patch b/packages/glibc-ports/2.16.0/0006-fpu-cw-mips.patch deleted file mode 100644 index 87d56f5..0000000 --- a/packages/glibc-ports/2.16.0/0006-fpu-cw-mips.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html - ---- - sysdeps/mips/fpu_control.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/sysdeps/mips/fpu_control.h -+++ b/sysdeps/mips/fpu_control.h -@@ -85,7 +85,7 @@ - #define _FPU_RC_UP 0x2 - #define _FPU_RC_DOWN 0x3 - --#define _FPU_RESERVED 0xfe3c0000 /* Reserved bits in cw */ -+#define _FPU_RESERVED 0xfebc0000 /* Reserved bits in cw */ - - - /* The fdlibm code requires strict IEEE double precision arithmetic, diff --git a/packages/glibc-ports/2.16.0/chksum b/packages/glibc-ports/2.16.0/chksum deleted file mode 100644 index 02803df..0000000 --- a/packages/glibc-ports/2.16.0/chksum +++ /dev/null @@ -1,12 +0,0 @@ -md5 glibc-ports-2.16.0.tar.xz 9a2439641be7ca8b01a3175324013031 -sha1 glibc-ports-2.16.0.tar.xz 429b979b697a97befb56cce49b96ee47d708f20a -sha256 glibc-ports-2.16.0.tar.xz 93a10ac3b9ab70ccc59dfe50a4747d48a7e92f9481656f8a37558a2767ac02f3 -sha512 glibc-ports-2.16.0.tar.xz 8653ad9f5cf239a55eb2e236f9510ba227e910168efefd74df8e4951f2e1e4bca69598bc23daa6581e0ba94fe334ac625524fb22f0d38c2a07e373eda1db821b -md5 glibc-ports-2.16.0.tar.bz2 668bcd584718ff0c6aa2f14b668595b6 -sha1 glibc-ports-2.16.0.tar.bz2 957631d4a8553942e9cf88065b21bcaa51b12a95 -sha256 glibc-ports-2.16.0.tar.bz2 d56578a3e1b6ace86db170709d0ee8da296403178901bcfc40747a9cc3b18463 -sha512 glibc-ports-2.16.0.tar.bz2 bf3da5acc0d15e0ab22faaaa36e4721e72b1e6bdc8e3ae1b115a2087938499f455e4c348216b29c537c58fd0af0327d5edf4ae8611755399d70eaefde4eb113c -md5 glibc-ports-2.16.0.tar.gz 20c689888d89f9c11dd7f91b48ca4f69 -sha1 glibc-ports-2.16.0.tar.gz 6020c8eecb3a0a22c8669b91f09276fecfcad98f -sha256 glibc-ports-2.16.0.tar.gz 1092e81d0c9c1bc29343004c1d01fb0d89eb49dd0fd5339b2f2e64a44b582d10 -sha512 glibc-ports-2.16.0.tar.gz 00ad51d3e3ab2acdcc4978cfbd5d5e3ca0c41d4c684e621201557e9d48583fc0e69827f03fe10aaa6eb1e58373ecfced909abfdb23f3ee1825d6b6b50d25b23c diff --git a/packages/glibc-ports/2.16.0/version.desc b/packages/glibc-ports/2.16.0/version.desc deleted file mode 100644 index e69de29..0000000 -- cgit v0.10.2-6-g49f6 From 4c6604e730ee786709e8c39ab9e54eec06990e49 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 1 Jan 2022 16:23:19 -0800 Subject: Remove gcc-oracle-4.8-44.0.5 GCC 4.8 and its prerequisites have been removed by 04dce680, 41d4583a and e4221734; as a result, 4.8-based version of gcc-oracle became unbuildable (no valid versions for the prerequisites). Update the samples to use 4.9.4; which however fails to build on a modern host GCC. Build fix backported to gcc-4.9 and gcc-5 versions. Fix binutils-oracle build with host GCC11. Signed-off-by: Alexey Neyman diff --git a/packages/binutils-oracle/git-889339ab/0012-Fix-a-missing-include-of-string.patch b/packages/binutils-oracle/git-889339ab/0012-Fix-a-missing-include-of-string.patch new file mode 100644 index 0000000..b04033a --- /dev/null +++ b/packages/binutils-oracle/git-889339ab/0012-Fix-a-missing-include-of-string.patch @@ -0,0 +1,26 @@ +From 23272f9927dc95c0cf6f7c5aabcc0551eca572c5 Mon Sep 17 00:00:00 2001 +From: Martin Liska +Date: Fri, 7 Jun 2019 07:36:52 +0200 +Subject: [PATCH] Fix a missing include of + +gold/ChangeLog: + +2019-06-07 Martin Liska + + * errors.h: Include string. +--- + gold/errors.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gold/errors.h b/gold/errors.h +index 1e61c8dbb5..805b25fc9c 100644 +--- a/gold/errors.h ++++ b/gold/errors.h +@@ -24,6 +24,7 @@ + #define GOLD_ERRORS_H + + #include ++#include + + #include "gold-threads.h" + diff --git a/packages/gcc-oracle/4.8.5-44.0.5/version.desc b/packages/gcc-oracle/4.8.5-44.0.5/version.desc deleted file mode 100644 index 2f2ac61..0000000 --- a/packages/gcc-oracle/4.8.5-44.0.5/version.desc +++ /dev/null @@ -1,2 +0,0 @@ -repository_branch='oracle/gcc/ol7-u9' -version_number='4.8' diff --git a/packages/gcc-oracle/package.desc b/packages/gcc-oracle/package.desc deleted file mode 100644 index 6ccf4cc..0000000 --- a/packages/gcc-oracle/package.desc +++ /dev/null @@ -1,5 +0,0 @@ -master='gcc' -repository='git https://github.com/oracle/gcc.git' -origin='Oracle' -src_release='n' -src_devel='y' diff --git a/packages/gcc/4.9.4/0034-c++17-build-failure.patch b/packages/gcc/4.9.4/0034-c++17-build-failure.patch new file mode 100644 index 0000000..cc56aca --- /dev/null +++ b/packages/gcc/4.9.4/0034-c++17-build-failure.patch @@ -0,0 +1,17 @@ +Fixes + +.../gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 + +Fixed upstream in GCC6+ in d57c99458933. + +--- gcc-4.9.4/gcc/reload.h 2022-01-01 15:51:43.293254281 -0800 ++++ gcc-4.9.4/gcc/reload.h 2022-01-01 15:51:58.437424873 -0800 +@@ -166,7 +166,7 @@ + value indicates the level of indirect addressing supported, e.g., two + means that (MEM (MEM (REG n))) is also valid if (REG n) does not get + a hard register. */ +- bool x_spill_indirect_levels; ++ unsigned char x_spill_indirect_levels; + + /* True if caller-save has been reinitialized. */ + bool x_caller_save_initialized_p; diff --git a/packages/gcc/5.5.0/0035-c++17-build-failure.patch b/packages/gcc/5.5.0/0035-c++17-build-failure.patch new file mode 100644 index 0000000..a99af49 --- /dev/null +++ b/packages/gcc/5.5.0/0035-c++17-build-failure.patch @@ -0,0 +1,21 @@ +Fixes + +.../gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 + +Fixed upstream in GCC6+ in d57c99458933. + +--- + gcc/reload.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/gcc/reload.h ++++ b/gcc/reload.h +@@ -168,7 +168,7 @@ + value indicates the level of indirect addressing supported, e.g., two + means that (MEM (MEM (REG n))) is also valid if (REG n) does not get + a hard register. */ +- bool x_spill_indirect_levels; ++ unsigned char x_spill_indirect_levels; + + /* True if caller-save has been reinitialized. */ + bool x_caller_save_initialized_p; diff --git a/samples/aarch64-ol7u9-linux-gnu/crosstool.config b/samples/aarch64-ol7u9-linux-gnu/crosstool.config index 165468c..ae644e6 100644 --- a/samples/aarch64-ol7u9-linux-gnu/crosstool.config +++ b/samples/aarch64-ol7u9-linux-gnu/crosstool.config @@ -5,17 +5,13 @@ CT_ARCH_64=y CT_TARGET_VENDOR="ol7u9" CT_KERNEL_LINUX=y CT_LINUX_USE_ORACLE=y -CT_LINUX_ORACLE_V_4_14=y -CT_LINUX_ORACLE_VERSION="4.14.35-2025.400.8" CT_BINUTILS_USE_ORACLE=y -CT_BINUTILS_ORACLE_V_2_27_44=y CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_GLIBC_USE_ORACLE=y -CT_GLIBC_ORACLE_V_2_17_317_0_3=y -CT_GCC_USE_ORACLE=y -CT_GCC_ORACLE_V_4_8=y -CT_GCC_ORACLE_VERSION="4.8.5-44.0.5" +CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized" +CT_GLIBC_ENABLE_COMMON_FLAG=y +CT_GCC_V_4_9=y CT_CC_LANG_CXX=y diff --git a/samples/arm-ol7u9-linux-gnueabi/crosstool.config b/samples/arm-ol7u9-linux-gnueabi/crosstool.config index 1894fe8..93961af 100644 --- a/samples/arm-ol7u9-linux-gnueabi/crosstool.config +++ b/samples/arm-ol7u9-linux-gnueabi/crosstool.config @@ -1,21 +1,17 @@ CT_CONFIG_VERSION="3" CT_OBSOLETE=y CT_ARCH_ARM=y -CT_TARGET_VENDOR="ol7u9" CT_ARCH_FLOAT_SW=y +CT_TARGET_VENDOR="ol7u9" CT_KERNEL_LINUX=y CT_LINUX_USE_ORACLE=y -CT_LINUX_ORACLE_V_4_14=y -CT_LINUX_ORACLE_VERSION="4.14.35-2025.400.8" CT_BINUTILS_USE_ORACLE=y -CT_BINUTILS_ORACLE_V_2_27_44=y CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_GLIBC_USE_ORACLE=y -CT_GLIBC_ORACLE_V_2_17_317_0_3=y -CT_GCC_USE_ORACLE=y -CT_GCC_ORACLE_V_4_8=y -CT_GCC_ORACLE_VERSION="4.8.5-44.0.5" +CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized" +CT_GLIBC_ENABLE_COMMON_FLAG=y +CT_GCC_V_4_9=y CT_CC_LANG_CXX=y diff --git a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config index 1673129..fd33aee 100644 --- a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config +++ b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config @@ -1,21 +1,16 @@ -CT_CONFIG_VERSION="3" CT_OBSOLETE=y CT_ARCH_ARM=y -CT_TARGET_VENDOR="ol7u9" CT_ARCH_FLOAT_HW=y +CT_TARGET_VENDOR="ol7u9" CT_KERNEL_LINUX=y CT_LINUX_USE_ORACLE=y -CT_LINUX_ORACLE_V_4_14=y -CT_LINUX_ORACLE_VERSION="4.14.35-2025.400.8" CT_BINUTILS_USE_ORACLE=y -CT_BINUTILS_ORACLE_V_2_27_44=y CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_GLIBC_USE_ORACLE=y -CT_GLIBC_ORACLE_V_2_17_317_0_3=y -CT_GCC_USE_ORACLE=y -CT_GCC_ORACLE_V_4_8=y -CT_GCC_ORACLE_VERSION="4.8.5-44.0.5" +CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized" +CT_GLIBC_ENABLE_COMMON_FLAG=y +CT_GCC_V_4_9=y CT_CC_LANG_CXX=y -- cgit v0.10.2-6-g49f6 From cc6b7fad46f5cb3d84cf87ae47c5f723803a67a3 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 5 Jan 2022 00:37:45 -0800 Subject: Retire obsoleted milestones ... and the code dependent on them, after the latest wave of obsolete package removals. This concludes the glorious history of the original uClibc (non-NG) with lots of kludges removed. There was a choice here, whether to call the resulting libc "uClibc" or "uClibc-ng". I opted in favor of giving uClibc-ng the recognition it deserves, although it had some ripple effect in the ct-ng code. Signed-off-by: Alexey Neyman diff --git a/config/cc/gcc.in b/config/cc/gcc.in index e068afd..742d563 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -7,19 +7,14 @@ ## select CC_SUPPORT_OBJC ## select CC_SUPPORT_OBJCXX ## select CC_SUPPORT_GOLANG +# ISL 0.15 is the oldest release present in CTNG. # GCC7 requires ISL 0.15+ -## select ISL_REQUIRE_0_15_or_later if ISL_NEEDED && GCC_7_or_later # GCC6 requires ISL 0.14+ (it says 0.14-0.16, but accepts newer ISL as well) -## select ISL_REQUIRE_0_14_or_later if ISL_NEEDED && GCC_6_or_later # GCC5 requires ISL 0.12+ (again, it says 0.12-0.16, but also accepts newer ISL up to 0.18; # fails to compile with 0.19+) -## select ISL_REQUIRE_0_12_or_later if ISL_NEEDED && GCC_5_or_later ## select ISL_REQUIRE_0_18_or_older if ISL_NEEDED && GCC_5_or_later && !GCC_6_or_later # GCC4.9 requires ISL 0.10..0.15 -# GCC4.8 requires ISL 0.10..0.14 -## select ISL_REQUIRE_0_10_or_later if ISL_NEEDED && GCC_4_8_or_later ## select ISL_REQUIRE_0_15_or_older if ISL_NEEDED && GCC_4_9_or_later && !GCC_5_or_later -## select ISL_REQUIRE_0_14_or_older if ISL_NEEDED && GCC_4_8_or_later && !GCC_4_9_or_later ## help gcc is the full-blown GNU compiler. This is what most people will choose. ## help @@ -265,7 +260,7 @@ config CC_GCC_LIBSANITIZER bool prompt "Compile libsanitizer" depends on THREADS_NATIVE - depends on !LIBC_UCLIBC && !LIBC_MUSL # Currently lacks required headers (like netrom.h) + depends on !LIBC_UCLIBC_NG && !LIBC_MUSL # Currently lacks required headers (like netrom.h) help libsanitizer is a library which provides run-time sanitising of either or both of: diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in index 7270244..f49d1a7 100644 --- a/config/comp_libs/gmp.in +++ b/config/comp_libs/gmp.in @@ -1,5 +1 @@ # GMP options - -config GMP_HAS_MPBSD - bool - default y if !GMP_5_1_0_or_later diff --git a/config/comp_libs/isl.in b/config/comp_libs/isl.in index fe6fa8d..22b0cad 100644 --- a/config/comp_libs/isl.in +++ b/config/comp_libs/isl.in @@ -1,13 +1 @@ # ISL options -# CLooG 0.18.4 requires ISL 0.12 or newer -# CLooG 0.18.1 requires ISL 0.12 or older -## select CLOOG_REQUIRE_0_18_1_or_older if CLOOG_NEEDED && !ISL_0_12_or_later -## select CLOOG_REQUIRE_0_18_4_or_later if CLOOG_NEEDED && !ISL_0_14_or_older - -config ISL_NEEDS_WITH_GMP - bool - default y if !ISL_0_12_or_later - -config ISL_HAS_WITH_PIPLIB - bool - default y if !ISL_0_14_or_later diff --git a/config/comp_libs/mpc.in b/config/comp_libs/mpc.in index 2ea3c0c..422935f 100644 --- a/config/comp_libs/mpc.in +++ b/config/comp_libs/mpc.in @@ -1,6 +1,3 @@ # MPC options -# MPC 1.1.0 and later requires MPFR 3.0.0 or later and GMP 5.0.0 or later. # MPC 1.0.x and earlier break with MPFR 4.0.0. -## select MPFR_REQUIRE_3_0_0_or_later if MPFR_NEEDED && MPC_1_1_0_or_later -## select GMP_REQUIRE_5_0_0_or_later if GMP_NEEDED && MPC_1_1_0_or_later ## select MPFR_REQUIRE_older_than_4_0_0 if MPFR_NEEDED && !MPC_1_1_0_or_later diff --git a/config/comp_libs/newlib-nano.in b/config/comp_libs/newlib-nano.in index 5a81fde..e7ef6f7 100644 --- a/config/comp_libs/newlib-nano.in +++ b/config/comp_libs/newlib-nano.in @@ -1,6 +1,7 @@ # newlib-nano options ## depends on BARE_METAL +## select LIBC_PROVIDES_CXA_ATEXIT ## help Newlib-nano is a C library intended for use on embedded systems. It is a ## help conglomeration of several library parts, all under free software @@ -37,21 +38,6 @@ config NEWLIB_NANO_INSTALL_IN_TARGET Additionally the newlib-nano version of newlib.h will get copied to include/newlib-nano/newlib.h. -# maybe older versions of newlib will support it too, but this -# needs to be checked -config NEWLIB_NANO_CXA_ATEXIT - def_bool y - depends on NEWLIB_NANO_2_0_or_later - select LIBC_PROVIDES_CXA_ATEXIT - -config NEWLIB_NANO_HAS_NANO_MALLOC - def_bool y - depends on NEWLIB_NANO_2_1_or_later - -config NEWLIB_NANO_HAS_NANO_FORMATTED_IO - def_bool y - depends on NEWLIB_NANO_2_2_or_later - config LIBC_NEWLIB_NANO_TARGET_CFLAGS string prompt "Target CFLAGS for newlib" @@ -225,7 +211,6 @@ config LIBC_NEWLIB_NANO_NANO_MALLOC bool prompt "Enable Nano Malloc" default y - depends on NEWLIB_NANO_HAS_NANO_MALLOC help NEWLIB has two implementations of malloc family's functions, one in `mallocr.c' and the other one in `nano-mallocr.c'. This options @@ -237,7 +222,6 @@ config LIBC_NEWLIB_NANO_NANO_FORMATTED_IO bool prompt "Enable Nano Formatted I/O" default y - depends on NEWLIB_NANO_HAS_NANO_FORMATTED_IO help This builds NEWLIB with a special implementation of formatted I/O functions, designed to lower the size of application on small systems diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native index 7ac8ec2..b4721c8 100644 --- a/config/debug/gdb.in.native +++ b/config/debug/gdb.in.native @@ -6,8 +6,8 @@ config GDB_NATIVE depends on ! BARE_METAL depends on ! LIBC_BIONIC depends on CC_LANG_CXX || !GDB_8_0_or_later - select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC && GDB_8_0_or_later - select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC && GDB_8_3_or_later + select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC_NG && GDB_8_0_or_later + select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC_NG && GDB_8_3_or_later select EXPAT_TARGET select NCURSES_TARGET select GMP_TARGET if GDB_11_1_or_later @@ -19,8 +19,8 @@ config GDB_GDBSERVER prompt "gdbserver" default y depends on ! BARE_METAL - select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC && GDB_8_0_or_later - select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC && GDB_8_3_or_later + select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC_NG && GDB_8_0_or_later + select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC_NG && GDB_8_3_or_later help Build and install a gdbserver for the target, to run on the target. diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index 1cdd157..75bdf4f 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -7,10 +7,3 @@ ## help It intercepts and records the dynamic library calls which are called by ## help the executed process and the signals which are received by that process. ## help It can also intercept and print the system calls executed by the program. - -# Ltrace 0.5.3 had a unique hand-crafted configure script that has to be -# run differently from any preceding or following releases. This serves -# as a reminder to remove that code once 0.5.3 support is dropped. -config LTRACE_0_5_3_CONFIGURE - bool - default y if LTRACE_V_0_5_3 diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 63c31f6..39c2c20 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -66,7 +66,6 @@ config GLIBC_DEP_MAKE_4_0 def_bool y depends on GLIBC_2_28_or_later && !CONFIGURE_has_make_4_0_or_newer select COMP_TOOLS_MAKE - select MAKE_REQUIRE_4_0_or_later select MAKE_GNUMAKE_SYMLINK # Override old host make in .build/tools/bin # Glibc 2.31 removed support for pre-v8 SPARC in 32-bit mode (64-bit mode always diff --git a/config/libc/mingw-w64.in b/config/libc/mingw-w64.in index d176e47..1880f08 100644 --- a/config/libc/mingw-w64.in +++ b/config/libc/mingw-w64.in @@ -9,10 +9,6 @@ ## ## help The de-facto standard for Mingw distributions. -config MINGW_W64_REQUIRES_W64_VENDOR - bool - default y if MINGW_W64_V4_or_later - config THREADS default "win32" if THREADS_NATIVE default "posix" if THREADS_POSIX diff --git a/config/libc/newlib.in b/config/libc/newlib.in index ce426da..83ae4b1 100644 --- a/config/libc/newlib.in +++ b/config/libc/newlib.in @@ -1,6 +1,7 @@ # newlib options ## depends on BARE_METAL +## select LIBC_PROVIDES_CXA_ATEXIT ## select LIBC_SUPPORT_THREADS_NONE ## select CC_CORE_PASS_1_NEEDED @@ -11,21 +12,6 @@ ## help array of processors, and will usually work on any architecture with ## help the addition of a few low-level routines. -# maybe older versions of newlib will support it too, but this -# needs to be checked -config NEWLIB_CXA_ATEXIT - def_bool y - depends on NEWLIB_2_0_or_later - select LIBC_PROVIDES_CXA_ATEXIT - -config NEWLIB_HAS_NANO_MALLOC - def_bool y - depends on NEWLIB_2_1_or_later - -config NEWLIB_HAS_NANO_FORMATTED_IO - def_bool y - depends on NEWLIB_2_2_or_later - config LIBC_NEWLIB_TARGET_CFLAGS string prompt "Target CFLAGS for newlib" @@ -197,7 +183,6 @@ config LIBC_NEWLIB_LTO config LIBC_NEWLIB_NANO_MALLOC bool prompt "Enable Nano Malloc" - depends on NEWLIB_HAS_NANO_MALLOC help NEWLIB has two implementations of malloc family's functions, one in `mallocr.c' and the other one in `nano-mallocr.c'. This options @@ -208,7 +193,6 @@ config LIBC_NEWLIB_NANO_MALLOC config LIBC_NEWLIB_NANO_FORMATTED_IO bool prompt "Enable Nano Formatted I/O" - depends on NEWLIB_HAS_NANO_FORMATTED_IO help This builds NEWLIB with a special implementation of formatted I/O functions, designed to lower the size of application on small systems diff --git a/config/libc/uClibc-ng.in b/config/libc/uClibc-ng.in new file mode 100644 index 0000000..705c0d4 --- /dev/null +++ b/config/libc/uClibc-ng.in @@ -0,0 +1,170 @@ +# uClibc options + +## depends on ! WINDOWS && ! BARE_METAL +## +## select LIBC_SUPPORT_THREADS_LT +## select LIBC_SUPPORT_THREADS_NONE +## select LIBC_SUPPORT_THREADS_NATIVE +## select CC_CORE_PASS_1_NEEDED +## +## help The de-facto standard for embeded linux systems. +## help +## help Highly configurable, thus as feature-rich as you +## help need, without compromising for size. + +config THREADS + default "nptl" if THREADS_NATIVE + default "linuxthreads" if THREADS_LT + +if ARCH_FLOAT_SOFTFP +comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG" +comment "You may experience issues, although it should work just fine" +endif # ARCH_FLOAT_SOFTFP + +choice + bool + prompt "uClibc verbosity:" + default LIBC_UCLIBC_VERBOSITY_0 + +config LIBC_UCLIBC_VERBOSITY_0 + bool + prompt "Quiet build" + help + Print terse command indications. + +config LIBC_UCLIBC_VERBOSITY_1 + bool + prompt "Brief build (show defines, ld flags)" + help + Print simplified command lines. + +config LIBC_UCLIBC_VERBOSITY_2 + bool + prompt "Very verbose build" + help + Print full command lines. + +endchoice + +# uClibc-ng has reverted the meaning of V=1 and V=2 compared to its +# ancestor, uClibc, in order to match kernel's Kbuild settings. +# Hence, for uClibc-ng supply V=2 if "brief build" is selected, +# and so forth. +config LIBC_UCLIBC_VERBOSITY + string + default "" if LIBC_UCLIBC_VERBOSITY_0 + default "V=2" if LIBC_UCLIBC_VERBOSITY_1 + default "V=1" if LIBC_UCLIBC_VERBOSITY_2 + +choice + bool + prompt "Debug level" + default LIBC_UCLIBC_DEBUG_LEVEL_0 + +config LIBC_UCLIBC_DEBUG_LEVEL_0 + bool + prompt "none" + +config LIBC_UCLIBC_DEBUG_LEVEL_1 + bool + prompt "minimal" + +config LIBC_UCLIBC_DEBUG_LEVEL_2 + bool + prompt "normal" + +config LIBC_UCLIBC_DEBUG_LEVEL_3 + bool + prompt "all" + +endchoice + +config LIBC_UCLIBC_DEBUG_LEVEL + int + default 0 if LIBC_UCLIBC_DEBUG_LEVEL_0 + default 1 if LIBC_UCLIBC_DEBUG_LEVEL_1 + default 2 if LIBC_UCLIBC_DEBUG_LEVEL_2 + default 3 if LIBC_UCLIBC_DEBUG_LEVEL_3 + +config LIBC_UCLIBC_CONFIG_FILE + string + prompt "Configuration file" + default "" + help + Path to the configuration file. + + If the file is not provided, we fall back to a default config file. + +config LIBC_UCLIBC_LOCALES + bool + select LIBC_UCLIBC_WCHAR + # Before it became a separate option, libiconv depended on locales + prompt "Add support for locales" + help + Say y if you want uClibc to support localisation. + + Note that seems to be broken on recent uClibc releases. + +config LIBC_UCLIBC_LIBICONV + bool "Enable iconv" + help + Say y if you want to enable and the corresponding interfaces. + +config LIBC_UCLIBC_IPV6 + bool + prompt "Add support for IPv6" + help + Say y if you want uClibc to support IPv6. + +config LIBC_UCLIBC_WCHAR + bool + prompt "Add support for WCHAR" + help + Say y if you want uClibc to support WCHAR. + + Maybe this is needed, if you're building a C++-Compiler + +config LIBC_UCLIBC_FENV + bool + prompt "Add support for fenv.h" + default y if ARCH_X86 + help + fenv.h provides functions to control the floating point environment, + such as rounding mode, exceptions... + + For some architectures, fenv.h is incomplete, so is not installed + by default. x86 is known to have a rather complete fenv.h, so it is + installed by default only for x86. + + If you need fenv.h on other architectures, say 'y' here, but you may + encounter some issues. + +config LIBC_UCLIBC_HAS_SSP + bool + prompt "Support stack smashing protection (SSP)" + default y + help + Enable support for building programs with -fstack-protector family + of options. If this option is disabled, one can also use a standalone + libssp library from GCC. + +config LIBC_UCLIBC_BUILD_SSP + bool + prompt "Build uClibc with SSP" + depends on LIBC_UCLIBC_HAS_SSP + help + Build uClibc with -fstack-protector. This adds runtime overhead + to many function calls and is disabled by default. + +if ARCH_ARM +config LIBC_UCLIBC_USE_GNU_SUFFIX + bool + default y + prompt "Use -uclibcgnueabi suffix" + help + Depending on where the resulting toolchain will be used, you may need + to tweak the "system" part of the target tuple. Buildroot prefers + to have arm-*-linux-uclibcgnueabi; OpenEmbedded prefers + arm-*-linux-uclibceabi. Other tools seem to either accept both, or + don't care about the suffix. +endif diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in deleted file mode 100644 index c88bbc8..0000000 --- a/config/libc/uClibc.in +++ /dev/null @@ -1,239 +0,0 @@ -# uClibc options - -## depends on ! WINDOWS && ! BARE_METAL -## -## select LIBC_SUPPORT_THREADS_LT -## select LIBC_SUPPORT_THREADS_NONE -## select LIBC_SUPPORT_THREADS_NATIVE if UCLIBC_0_9_33_2_or_later -## select CC_CORE_PASS_1_NEEDED -## -## help The de-facto standard for embeded linux systems. -## help -## help Highly configurable, thus as feature-rich as you -## help need, without compromising for size. - -config THREADS - default "nptl" if THREADS_NATIVE - default "linuxthreads" if THREADS_LT - -if ARCH_FLOAT_SOFTFP -comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG" -comment "You may experience issues, although it should work just fine" -endif # ARCH_FLOAT_SOFTFP - -config LIBC_UCLIBC_HAS_SUNRPC - bool - default y if !UCLIBC_1_0_23_or_later - -config LIBC_UCLIBC_HAS_LIBICONV - bool - default y if UCLIBC_1_0_21_or_later - -config LIBC_UCLIBC_PARALLEL - def_bool y - depends on UCLIBC_0_9_33_2_or_later - -config LIBC_UCLIBC_NG - def_bool y - depends on UCLIBC_1_0_0_or_later - -# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads -config UCLIBC_MERGED_LINUXTHREADS - def_bool y - depends on UCLIBC_1_0_15_or_later - -choice - bool - prompt "uClibc verbosity:" - default LIBC_UCLIBC_VERBOSITY_0 - -config LIBC_UCLIBC_VERBOSITY_0 - bool - prompt "Quiet build" - help - Print terse command indications. - -config LIBC_UCLIBC_VERBOSITY_1 - bool - prompt "Brief build (show defines, ld flags)" - help - Print simplified command lines. - -config LIBC_UCLIBC_VERBOSITY_2 - bool - prompt "Very verbose build" - help - Print full command lines. - -endchoice - -# uClibc-ng has reverted the meaning of V=1 and V=2 compared to its -# ancestor, uClibc, in order to match kernel's Kbuild settings. -# Hence, for uClibc-ng supply V=2 if "brief build" is selected, -# and so forth. -config LIBC_UCLIBC_VERBOSITY - string - default "" if LIBC_UCLIBC_VERBOSITY_0 - default "V=2" if LIBC_UCLIBC_VERBOSITY_1 && LIBC_UCLIBC_NG - default "V=1" if LIBC_UCLIBC_VERBOSITY_1 - default "V=1" if LIBC_UCLIBC_VERBOSITY_2 && LIBC_UCLIBC_NG - default "V=2" if LIBC_UCLIBC_VERBOSITY_2 - -choice - bool - prompt "Debug level" - default LIBC_UCLIBC_DEBUG_LEVEL_0 - -config LIBC_UCLIBC_DEBUG_LEVEL_0 - bool - prompt "none" - -config LIBC_UCLIBC_DEBUG_LEVEL_1 - bool - prompt "minimal" - -config LIBC_UCLIBC_DEBUG_LEVEL_2 - bool - prompt "normal" - -config LIBC_UCLIBC_DEBUG_LEVEL_3 - bool - prompt "all" - -endchoice - -config LIBC_UCLIBC_DEBUG_LEVEL - int - default 0 if LIBC_UCLIBC_DEBUG_LEVEL_0 - default 1 if LIBC_UCLIBC_DEBUG_LEVEL_1 - default 2 if LIBC_UCLIBC_DEBUG_LEVEL_2 - default 3 if LIBC_UCLIBC_DEBUG_LEVEL_3 - -config LIBC_UCLIBC_CONFIG_FILE - string - prompt "Configuration file" - default "" - help - Path to the configuration file. - - If the file is not provided, we fall back to a default config file. - -if THREADS_LT && !UCLIBC_MERGED_LINUXTHREADS - -choice - bool - prompt "Linuxthread implementation: " - default LIBC_UCLIBC_LNXTHRD_OLD - -config LIBC_UCLIBC_LNXTHRD_OLD - bool - prompt "old/stable" - help - From the uClibc config option help: - There are two versions of linuxthreads. The older (stable) version - has been in uClibc for quite a long time but hasn't seen too many - updates other than bugfixes. - -config LIBC_UCLIBC_LNXTHRD_NEW - bool - prompt "new" - help - From the uClibc config option help: - The new version has not been tested much, and lacks ports for arches - which glibc does not support (like frv, etc...), but is based on - the latest code from glibc, so it may be the only choice for the - newer ports (like alpha/amd64/64bit arches and hppa). - -endchoice - -endif # THREADS_LT - -config LIBC_UCLIBC_LNXTHRD - string - default "" if THREADS_NONE - default "" if THREADS_NATIVE - default "" if UCLIBC_MERGED_LINUXTHREADS - default "old" if LIBC_UCLIBC_LNXTHRD_OLD - default "new" if LIBC_UCLIBC_LNXTHRD_NEW - -config LIBC_UCLIBC_LOCALES - bool - select LIBC_UCLIBC_WCHAR - # Before it became a separate option, libiconv depended on locales - prompt "Add support for locales" - help - Say y if you want uClibc to support localisation. - - Note that seems to be broken on recent uClibc releases. - -config LIBC_UCLIBC_LIBICONV - bool "Enable iconv" - depends on LIBC_UCLIBC_HAS_LIBICONV - help - Say y if you want to enable and the corresponding interfaces. - -config LIBC_UCLIBC_IPV6 - bool - prompt "Add support for IPv6" - help - Say y if you want uClibc to support IPv6. - -config LIBC_UCLIBC_WCHAR - bool - prompt "Add support for WCHAR" - help - Say y if you want uClibc to support WCHAR. - - Maybe this is needed, if you're building a C++-Compiler - -config LIBC_UCLIBC_FENV - bool - prompt "Add support for fenv.h" - default y if ARCH_X86 - help - fenv.h provides functions to control the floating point environment, - such as rounding mode, exceptions... - - For some architectures, fenv.h is incomplete, so is not installed - by default. x86 is known to have a rather complete fenv.h, so it is - installed by default only for x86. - - If you need fenv.h on other architectures, say 'y' here, but you may - encounter some issues. - -config LIBC_UCLIBC_RPC - bool - prompt "Add support for RPC" - depends on LIBC_UCLIBC_HAS_SUNRPC - help - Enable support for remote procedure calls (RPC) in uClibc. - -config LIBC_UCLIBC_HAS_SSP - bool - prompt "Support stack smashing protection (SSP)" - default y - help - Enable support for building programs with -fstack-protector family - of options. If this option is disabled, one can also use a standalone - libssp library from GCC. - -config LIBC_UCLIBC_BUILD_SSP - bool - prompt "Build uClibc with SSP" - depends on LIBC_UCLIBC_HAS_SSP - help - Build uClibc with -fstack-protector. This adds runtime overhead - to many function calls and is disabled by default. - -if ARCH_ARM -config LIBC_UCLIBC_USE_GNU_SUFFIX - bool - default y - prompt "Use -uclibcgnueabi suffix" - help - Depending on where the resulting toolchain will be used, you may need - to tweak the "system" part of the target tuple. Buildroot prefers - to have arm-*-linux-uclibcgnueabi; OpenEmbedded prefers - arm-*-linux-uclibceabi. Other tools seem to either accept both, or - don't care about the suffix. -endif diff --git a/packages/cloog/package.desc b/packages/cloog/package.desc index f16f787..a06899f 100644 --- a/packages/cloog/package.desc +++ b/packages/cloog/package.desc @@ -1,5 +1,4 @@ pkg_label='CLooG' repository='git git://repo.or.cz/cloog.git' mirrors='http://www.bastoul.net/cloog/pages/download' -milestones='0.18.1 0.18.4' archive_formats='.tar.gz' diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc index 186f1a3..3a66781 100644 --- a/packages/gcc/package.desc +++ b/packages/gcc/package.desc @@ -2,5 +2,5 @@ repository='svn svn://gcc.gnu.org/svn/gcc' mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})' relevantpattern='4.*|. *|.' origin='GNU' -milestones='4.8 4.9 5 6 7 8 9 10 11' +milestones='4.9 5 6 7 8 9 10 11' archive_formats='.tar.xz .tar.gz' diff --git a/packages/gmp/package.desc b/packages/gmp/package.desc index 5936eea..c6ca8c5 100644 --- a/packages/gmp/package.desc +++ b/packages/gmp/package.desc @@ -2,6 +2,5 @@ repository='hg https://gmplib.org/repo/gmp/' bootstrap='./.bootstrap' mirrors='https://gmplib.org/download/gmp https://gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)' relevantpattern='*.*|.' -milestones='5.0.0 5.1.0' archive_formats='.tar.xz .tar.lz .tar.bz2' signature_format='packed/.sig' diff --git a/packages/isl/package.desc b/packages/isl/package.desc index 20f7e02..7ad6ae2 100644 --- a/packages/isl/package.desc +++ b/packages/isl/package.desc @@ -2,5 +2,5 @@ repository='git git://repo.or.cz/isl.git' bootstrap='./autogen.sh' mirrors='https://libisl.sourceforge.io' relevantpattern='*.*|.' -milestones='0.12 0.13 0.14 0.15 0.18' +milestones='0.15 0.18' archive_formats='.tar.xz .tar.bz2 .tar.gz' diff --git a/packages/make/package.desc b/packages/make/package.desc index c82c516..bd789ad 100644 --- a/packages/make/package.desc +++ b/packages/make/package.desc @@ -4,4 +4,3 @@ mirrors='$(CT_Mirrors GNU make)' relevantpattern='*.*|.' archive_formats='.tar.lz .tar.gz' signature_format='packed/.sig' -milestones='4.0' diff --git a/packages/mingw-w64/package.desc b/packages/mingw-w64/package.desc index d2f7e6d..6e09f67 100644 --- a/packages/mingw-w64/package.desc +++ b/packages/mingw-w64/package.desc @@ -1,6 +1,5 @@ repository='git https://git.code.sf.net/p/mingw-w64/mingw-w64' mirrors='http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/' relevantpattern='v*.*|.' -milestones='v4' archive_formats='.tar.bz2 .zip' signature_format='packed/.sig' diff --git a/packages/mpfr/package.desc b/packages/mpfr/package.desc index 43b8a36..15c54b5 100644 --- a/packages/mpfr/package.desc +++ b/packages/mpfr/package.desc @@ -5,4 +5,4 @@ mirrors='http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)' relevantpattern='*.*|.' archive_formats='.tar.xz .tar.bz2 .tar.gz .zip' signature_format='packed/.asc' -milestones='3.0.0 4.0.0' +milestones='4.0.0' diff --git a/packages/newlib-nano/package.desc b/packages/newlib-nano/package.desc index 1529f3e..ba18016 100644 --- a/packages/newlib-nano/package.desc +++ b/packages/newlib-nano/package.desc @@ -3,7 +3,6 @@ repository='git git://sourceware.org/git/newlib-cygwin.git' # Do not use "$(CT_Mirrors sourceware newlib)" here: the mirrors (kernel.org # and gnu.org) only store some older releases of newlib (2.0.0 and before). mirrors='ftp://sourceware.org/pub/newlib' -milestones='2.0 2.1 2.2' relevantpattern='*.*|.*. *.*|.' archive_filename='newlib-@{version}' archive_dirname='newlib-@{version}' diff --git a/packages/newlib/package.desc b/packages/newlib/package.desc index d9ebb3d..27a5fa6 100644 --- a/packages/newlib/package.desc +++ b/packages/newlib/package.desc @@ -3,6 +3,5 @@ repository='git git://sourceware.org/git/newlib-cygwin.git' # Do not use "$(CT_Mirrors sourceware newlib)" here: the mirrors (kernel.org # and gnu.org) only store some older releases of newlib (2.0.0 and before). mirrors='ftp://sourceware.org/pub/newlib' -milestones='2.0 2.1 2.2' relevantpattern='*.*|.*. *.*|.' archive_formats='.tar.gz' diff --git a/packages/uClibc-ng/package.desc b/packages/uClibc-ng/package.desc index 5d8eb98..4257bd2 100644 --- a/packages/uClibc-ng/package.desc +++ b/packages/uClibc-ng/package.desc @@ -1,4 +1,3 @@ -master='uClibc' origin='uclibc-ng.org' repository='git git://uclibc-ng.org/git/uclibc-ng' mirrors='http://downloads.uclibc-ng.org/releases/${CT_UCLIBC_NG_VERSION}' diff --git a/packages/uClibc/config b/packages/uClibc/config deleted file mode 100644 index 104eb5c..0000000 --- a/packages/uClibc/config +++ /dev/null @@ -1,277 +0,0 @@ -# -# Automatically generated make config: don't edit -# Version: 0.9.32-git -# Fri Jul 9 22:31:59 2010 -# -# TARGET_alpha is not set -# TARGET_arm is not set -# TARGET_avr32 is not set -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -# TARGET_i386 is not set -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set -# TARGET_xtensa is not set -# TARGET_c6x is not set - -# CONFIG_GENERIC_ARM is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM7TDMI is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM920T is not set -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM10T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM1176JZ_S is not set -# CONFIG_ARM1176JZF_S is not set -# CONFIG_ARM_CORTEX_M3 is not set -# CONFIG_ARM_CORTEX_M1 is not set -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -# CONFIG_ARM_IWMMXT is not set - -# COMPILE_IN_THUMB_MODE is not set -USE_BX=y - -TARGET_SUBARCH="" -# -# Target Architecture Features and Options -# -TARGET_ARCH="none" -FORCE_OPTIONS_FOR_ARCH=y -# -# Using ELF file format -# -# ARCH_LITTLE_ENDIAN is not set -# ARCH_BIG_ENDIAN is not set -# ARCH_WANTS_LITTLE_ENDIAN is not set -# ARCH_WANTS_BIG_ENDIAN is not set -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -UCLIBC_HAS_FPU=y -DO_C99_MATH=y -# DO_XSI_MATH is not set -# UCLIBC_HAS_FENV is not set -UCLIBC_HAS_LONG_DOUBLE_MATH=y -KERNEL_HEADERS="/usr/src/linux/include" -HAVE_DOT_CONFIG=y - -# -# General Library Settings -# -# HAVE_NO_PIC is not set -DOPIC=y -# ARCH_HAS_NO_SHARED is not set -# ARCH_HAS_NO_LDSO is not set -# FORCE_SHAREABLE_TEXT_SEGMENTS is not set -LDSO_LDD_SUPPORT=y -# LDSO_CACHE_SUPPORT is not set -LDSO_PRELOAD_ENV_SUPPORT=y -# LDSO_PRELOAD_FILE_SUPPORT is not set -# LDSO_STANDALONE_SUPPORT is not set -# LDSO_PRELINK_SUPPORT is not set -# UCLIBC_STATIC_LDCONFIG is not set -LDSO_RUNPATH=y -LDSO_SEARCH_INTERP_PATH=y -LDSO_LD_LIBRARY_PATH=y -# LDSO_NO_CLEANUP is not set -UCLIBC_CTOR_DTOR=y -# LDSO_GNU_HASH_SUPPORT is not set -# HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set -# UCLIBC_HAS_THREADS_NATIVE is not set -UCLIBC_HAS_THREADS=y -# PTHREADS_DEBUG_SUPPORT is not set -UCLIBC_HAS_SYSLOG=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -# MALLOC_SIMPLE is not set -MALLOC_STANDARD=y -MALLOC_GLIBC_COMPAT=y -UCLIBC_DYNAMIC_ATEXIT=y -# COMPAT_ATEXIT is not set -UCLIBC_SUSV3_LEGACY=y -# UCLIBC_SUSV3_LEGACY_MACROS is not set -UCLIBC_SUSV4_LEGACY=y -# UCLIBC_STRICT_HEADERS is not set -# UCLIBC_HAS_STUBS is not set -UCLIBC_HAS_SHADOW=y -UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y -UCLIBC_HAS___PROGNAME=y -UCLIBC_HAS_PTY=y -ASSUME_DEVPTS=y -UNIX98PTY_ONLY=y -UCLIBC_HAS_GETPT=y -UCLIBC_HAS_LIBUTIL=y -UCLIBC_HAS_TM_EXTENSIONS=y -UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y -UCLIBC_TZ_FILE_PATH="/etc/TZ" -UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y - -# -# Advanced Library Settings -# -UCLIBC_PWD_BUFFER_SIZE=256 -UCLIBC_GRP_BUFFER_SIZE=256 - -# -# Support various families of functions -# -UCLIBC_LINUX_MODULE_26=y -# UCLIBC_LINUX_MODULE_24 is not set -UCLIBC_LINUX_SPECIFIC=y -UCLIBC_HAS_GNU_ERROR=y -UCLIBC_BSD_SPECIFIC=y -UCLIBC_HAS_BSD_ERR=y -# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set -# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set -# UCLIBC_NTP_LEGACY is not set -# UCLIBC_SV4_DEPRECATED is not set -UCLIBC_HAS_REALTIME=y -UCLIBC_HAS_ADVANCED_REALTIME=y -UCLIBC_HAS_EPOLL=y -UCLIBC_HAS_XATTR=y -UCLIBC_HAS_PROFILING=y -UCLIBC_HAS_CRYPT_IMPL=y -# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set -# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set -UCLIBC_HAS_CRYPT=y -UCLIBC_HAS_NETWORK_SUPPORT=y -UCLIBC_HAS_SOCKET=y -UCLIBC_HAS_IPV4=y -# UCLIBC_HAS_IPV6 is not set -# UCLIBC_HAS_RPC is not set -# UCLIBC_HAS_FULL_RPC is not set -# UCLIBC_HAS_REENTRANT_RPC is not set -UCLIBC_USE_NETLINK=y -UCLIBC_SUPPORT_AI_ADDRCONFIG=y -# UCLIBC_HAS_BSD_RES_CLOSE is not set -UCLIBC_HAS_COMPAT_RES_STATE=y -# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set -UCLIBC_HAS_RESOLVER_SUPPORT=y -UCLIBC_HAS_LIBRESOLV_STUB=y -UCLIBC_HAS_LIBNSL_STUB=y - -# -# String and Stdio Support -# -UCLIBC_HAS_STRING_GENERIC_OPT=y -UCLIBC_HAS_STRING_ARCH_OPT=y -UCLIBC_HAS_CTYPE_TABLES=y -UCLIBC_HAS_CTYPE_SIGNED=y -# UCLIBC_HAS_CTYPE_UNSAFE is not set -UCLIBC_HAS_CTYPE_CHECKED=y -# UCLIBC_HAS_CTYPE_ENFORCED is not set -# UCLIBC_HAS_WCHAR is not set -# UCLIBC_HAS_LOCALE is not set -UCLIBC_HAS_HEXADECIMAL_FLOATS=y -# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set -UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y -# USE_OLD_VFPRINTF is not set -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y -# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set -# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set -UCLIBC_HAS_STDIO_BUFSIZ_4096=y -# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set -UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set -# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y -# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set -UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y -# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set -UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y -UCLIBC_HAS_PRINTF_M_SPEC=y -UCLIBC_HAS_ERRNO_MESSAGES=y -# UCLIBC_HAS_SYS_ERRLIST is not set -UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set -UCLIBC_HAS_GNU_GETOPT=y -UCLIBC_HAS_GNU_GETSUBOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -# UCLIBC_HAS_REGEX_OLD is not set -UCLIBC_HAS_FNMATCH=y -# UCLIBC_HAS_FNMATCH_OLD is not set -# UCLIBC_HAS_WORDEXP is not set -UCLIBC_HAS_NFTW=y -UCLIBC_HAS_FTW=y -# UCLIBC_HAS_FTS is not set -UCLIBC_HAS_GLOB=y -UCLIBC_HAS_GNU_GLOB=y -UCLIBC_HAS_UTMPX=y - -# -# Library Installation Options -# -RUNTIME_PREFIX="/" -DEVEL_PREFIX="/usr/" -MULTILIB_DIR="lib" -HARDWIRED_ABSPATH=y - -# -# Security options -# -# UCLIBC_BUILD_PIE is not set -# UCLIBC_HAS_ARC4RANDOM is not set -# HAVE_NO_SSP is not set -UCLIBC_HAS_SSP=y -# UCLIBC_HAS_SSP_COMPAT is not set -# SSP_QUICK_CANARY is not set -PROPOLICE_BLOCK_ABRT=y -# PROPOLICE_BLOCK_SEGV is not set -# UCLIBC_BUILD_SSP is not set -UCLIBC_BUILD_RELRO=y -UCLIBC_BUILD_NOW=y -UCLIBC_BUILD_NOEXECSTACK=y - -# -# uClibc development/debugging options -# -CROSS_COMPILER_PREFIX="" -UCLIBC_EXTRA_CFLAGS="" -# DODEBUG is not set -# DODEBUG_PT is not set -# DOSTRIP is not set -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -# UCLIBC_MALLOC_DEBUGGING is not set -# UCLIBC_HAS_BACKTRACE is not set -WARNINGS="-Wall" -# EXTRA_WARNINGS is not set -# DOMULTI is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/packages/uClibc/package.desc b/packages/uClibc/package.desc deleted file mode 100644 index 7035b96..0000000 --- a/packages/uClibc/package.desc +++ /dev/null @@ -1,8 +0,0 @@ -# Even though this is the "master" package, we really want to steer the users -# towards uClibc-ng, as the original uClibc is no longer maintained. -preferred='uClibc-ng' -origin='uclibc.org' -repository='git git://git.busybox.net/uClibc' -mirrors='http://www.uclibc.org/downloads http://www.uclibc.org/downloads/old-releases' -milestones='0.9.33.2 1.0.0 1.0.15 1.0.21 1.0.23' -archive_formats='.tar.xz .tar.bz2' diff --git a/samples/sparc-leon-linux-uclibc/uClibc-ng.config b/samples/sparc-leon-linux-uclibc/uClibc-ng.config new file mode 100644 index 0000000..c81724c --- /dev/null +++ b/samples/sparc-leon-linux-uclibc/uClibc-ng.config @@ -0,0 +1,19 @@ +TARGET_sparc=y +# UCLIBC_HAS_FPU is not set +DO_C99_MATH=y +UCLIBC_HAS_THREADS_NATIVE=y +UCLIBC_HAS_UTMPX=y +UCLIBC_HAS_UTMP=y +UCLIBC_SUSV3_LEGACY=y +UCLIBC_SUSV4_LEGACY=y +# UNIX98PTY_ONLY is not set +UCLIBC_HAS_LIBUTIL=y +UCLIBC_HAS_SHA256_CRYPT_IMPL=y +UCLIBC_HAS_SHA512_CRYPT_IMPL=y +UCLIBC_HAS_IPV6=y +UCLIBC_USE_NETLINK=y +UCLIBC_HAS_RESOLVER_SUPPORT=y +UCLIBC_HAS_LIBRESOLV_STUB=y +UCLIBC_HAS_WCHAR=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_HAS_PRINTF_M_SPEC=y diff --git a/samples/sparc-leon-linux-uclibc/uClibc.config b/samples/sparc-leon-linux-uclibc/uClibc.config deleted file mode 100644 index c81724c..0000000 --- a/samples/sparc-leon-linux-uclibc/uClibc.config +++ /dev/null @@ -1,19 +0,0 @@ -TARGET_sparc=y -# UCLIBC_HAS_FPU is not set -DO_C99_MATH=y -UCLIBC_HAS_THREADS_NATIVE=y -UCLIBC_HAS_UTMPX=y -UCLIBC_HAS_UTMP=y -UCLIBC_SUSV3_LEGACY=y -UCLIBC_SUSV4_LEGACY=y -# UNIX98PTY_ONLY is not set -UCLIBC_HAS_LIBUTIL=y -UCLIBC_HAS_SHA256_CRYPT_IMPL=y -UCLIBC_HAS_SHA512_CRYPT_IMPL=y -UCLIBC_HAS_IPV6=y -UCLIBC_USE_NETLINK=y -UCLIBC_HAS_RESOLVER_SUPPORT=y -UCLIBC_HAS_LIBRESOLV_STUB=y -UCLIBC_HAS_WCHAR=y -UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y -UCLIBC_HAS_PRINTF_M_SPEC=y diff --git a/scripts/build/arch/arm.sh b/scripts/build/arch/arm.sh index 9a53bc4..01a40bd 100644 --- a/scripts/build/arch/arm.sh +++ b/scripts/build/arch/arm.sh @@ -16,7 +16,7 @@ CT_DoArchTupleValues() { # The system part of the tuple: case "${CT_LIBC},${CT_ARCH_ARM_EABI}" in glibc,y) CT_TARGET_SYS=gnueabi;; - uClibc,y) CT_TARGET_SYS=uclibc${CT_LIBC_UCLIBC_USE_GNU_SUFFIX:+gnu}eabi;; + uClibc-ng,y)CT_TARGET_SYS=uclibc${CT_LIBC_UCLIBC_USE_GNU_SUFFIX:+gnu}eabi;; musl,y) CT_TARGET_SYS=musleabi;; bionic,y) CT_TARGET_SYS=androideabi;; *,y) CT_TARGET_SYS=eabi;; diff --git a/scripts/build/arch/powerpc.sh b/scripts/build/arch/powerpc.sh index 85c64d1..245adbe 100644 --- a/scripts/build/arch/powerpc.sh +++ b/scripts/build/arch/powerpc.sh @@ -14,7 +14,7 @@ CT_DoArchTupleValues () { case "${CT_LIBC}" in none|newlib|picolibc) CT_TARGET_SYS="elfspe";; *glibc) CT_TARGET_SYS="gnuspe";; - uClibc) CT_TARGET_SYS="uclibcgnuspe";; + uClibc-ng) CT_TARGET_SYS="uclibcgnuspe";; esac ;; esac diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh index 3655787..a17eda9 100644 --- a/scripts/build/companion_libs/100-gmp.sh +++ b/scripts/build/companion_libs/100-gmp.sh @@ -109,12 +109,6 @@ do_gmp_backend() { CT_DoLog EXTRA "Configuring GMP" - # FIXME is it needed even for older versions? They seem to compile fine - # without it. - if [ "${CT_GMP_HAS_MPBSD}" = "y" ]; then - extra_config+=("--enable-mpbsd") - fi - # To avoind “illegal text-relocation” linking error against # the static library, see: # https://github.com/Homebrew/homebrew-core/pull/25470 diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh index 8b1b720..3577b75 100644 --- a/scripts/build/companion_libs/121-isl.sh +++ b/scripts/build/companion_libs/121-isl.sh @@ -84,15 +84,6 @@ do_isl_backend() { CT_DoLog EXTRA "Configuring ISL" - if [ "${CT_ISL_NEEDS_WITH_GMP}" != "y" ]; then - extra_config+=("--with-libgmp-prefix=${prefix}") - extra_config+=("--with-libgmpxx-prefix=${prefix}") - fi - - if [ "${CT_ISL_HAS_WITH_PIPLIB}" != "y" ]; then - extra_config+=("--with-piplib=no") - fi - CT_DoExecLog CFG \ CFLAGS="${cflags}" \ CXXFLAGS="${cxxflags}" \ diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index 3f08226..9c9052a 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -19,32 +19,12 @@ do_debug_ltrace_build() { CT_Pushd "${CT_BUILD_DIR}/build-ltrace" CT_DoLog EXTRA "Configuring ltrace" - # ltrace-0.5.3 has a unique hand-crafted configure script. Releases - # 0.5.2 and earlier as well as 0.6.0 and later use GNU autotools. - if [ "${LTRACE_0_5_3_CONFIGURE}" = "y" ]; then - case "${CT_ARCH}:${CT_ARCH_BITNESS}" in - x86:32) ltrace_host="i386";; - x86:64) ltrace_host="x86_64";; - powerpc:*) ltrace_host="ppc";; - mips:*) ltrace_host="mipsel";; - *) ltrace_host="${CT_ARCH}";; - esac - CT_DoExecLog CFG \ - CC="${CT_TARGET}-${CT_CC}" \ - AR="${CT_TARGET}-ar" \ - HOST="${ltrace_host}" \ - HOST_OS="${CT_TARGET_KERNEL}" \ - CFLAGS="${CT_ALL_TARGET_CFLAGS}"\ - ${CONFIG_SHELL} \ - ./configure --prefix=/usr - else - CT_DoExecLog CFG \ - ${CONFIG_SHELL} \ - ./configure \ - --build=${CT_BUILD} \ - --host=${CT_TARGET} \ - --prefix=/usr - fi + CT_DoExecLog CFG \ + ${CONFIG_SHELL} \ + ./configure \ + --build=${CT_BUILD} \ + --host=${CT_TARGET} \ + --prefix=/usr CT_DoLog EXTRA "Building ltrace" CT_DoExecLog ALL make diff --git a/scripts/build/libc/mingw-w64.sh b/scripts/build/libc/mingw-w64.sh index 683f8be..60f514a 100644 --- a/scripts/build/libc/mingw-w64.sh +++ b/scripts/build/libc/mingw-w64.sh @@ -56,15 +56,13 @@ mingw_w64_start_files() { do_check_mingw_vendor_tuple() { - if [ "${CT_MINGW_W64_REQUIRES_W64_VENDOR}" = "y" ]; then - CT_DoStep INFO "Checking configured vendor tuple" - if [ ${CT_TARGET_VENDOR} = "w64" ]; then - CT_DoLog DEBUG "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers." - else - CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!" - fi - CT_EndStep - fi + CT_DoStep INFO "Checking configured vendor tuple" + if [ ${CT_TARGET_VENDOR} = "w64" ]; then + CT_DoLog DEBUG "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers." + else + CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!" + fi + CT_EndStep } do_mingw_tools() diff --git a/scripts/build/libc/uClibc-ng.sh b/scripts/build/libc/uClibc-ng.sh new file mode 100644 index 0000000..16ebc2c --- /dev/null +++ b/scripts/build/libc/uClibc-ng.sh @@ -0,0 +1,421 @@ +# This file declares functions to install the uClibc C library +# Copyright 2007 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +# Build and install headers and start files +uClibc_ng_start_files() +{ + # Start files and Headers should be configured the same way as the + # final libc, but built and installed differently. + uClibc_ng_backend libc_mode=startfiles +} + +# This function builds and install the full C library +uClibc_ng_main() +{ + uClibc_ng_backend libc_mode=final +} + +# Common backend for 1st and 2nd passes. +uClibc_ng_backend() +{ + local libc_mode + local arg + + for arg in "$@"; do + eval "${arg// /\\ }" + done + + case "${libc_mode}" in + startfiles) CT_DoStep INFO "Installing C library headers & start files";; + final) CT_DoStep INFO "Installing C library";; + *) CT_Abort "Unsupported (or unset) libc_mode='${libc_mode}'";; + esac + + CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc-${libc_mode}" + CT_IterateMultilibs uClibc_ng_backend_once multilib libc_mode="${libc_mode}" + CT_Popd + CT_EndStep +} + +# Common backend for 1st and 2nd passes, once per multilib. +uClibc_ng_backend_once() +{ + local libc_mode + local multi_dir multi_os_dir multi_root multi_flags multi_index multi_count + local multilib_dir startfiles_dir + local jflag=${CT_JOBSFLAGS} + local -a make_args + local extra_cflags f cfg_cflags cf + local hdr_install_subdir + + for arg in "$@"; do + eval "${arg// /\\ }" + done + + CT_DoStep INFO "Building for multilib ${multi_index}/${multi_count}: '${multi_flags}'" + + multilib_dir="lib/${multi_os_dir}" + startfiles_dir="${multi_root}/usr/${multilib_dir}" + CT_SanitizeVarDir multilib_dir startfiles_dir + + # Construct make arguments: + # - uClibc uses the CROSS environment variable as a prefix to the compiler + # tools to use. Since it requires core pass-1, thusly named compiler is + # already available. + # - Note about CFLAGS: In uClibc, CFLAGS are generated by Rules.mak, + # depending on the configuration of the library. That is, they are tailored + # to best fit the target. So it is useless and seems to be a bad thing to + # use LIBC_EXTRA_CFLAGS here. + # - We do _not_ want to strip anything for now, in case we specifically + # asked for a debug toolchain, thus the STRIPTOOL= assignment. + make_args=( CROSS_COMPILE="${CT_TARGET}-" \ + HOSTCC="${CT_BUILD}-gcc" \ + PREFIX="${multi_root}/" \ + MULTILIB_DIR="${multilib_dir}" \ + STRIPTOOL=true \ + ${CT_LIBC_UCLIBC_VERBOSITY} \ + ) + + # Simply copy files until uClibc has the ability to build out-of-tree + CT_DoLog EXTRA "Copying sources to build dir" + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-ng/." . + + # Force the date of the pregen locale data, as the + # newer ones that are referenced are not available + CT_DoLog EXTRA "Applying configuration" + + # Use the default config if the user did not provide one. + if [ -z "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then + CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/packages/uClibc-ng/config" + fi + + manage_uClibc_config "${CT_LIBC_UCLIBC_CONFIG_FILE}" .config "${multi_flags}" + CT_DoExecLog ALL make "${make_args[@]}" olddefconfig + + # Now filter the multilib flags. manage_uClibc_config did the opposite of + # what Rules.mak in uClibc would do: by the multilib's CFLAGS, it determined + # the applicable configuration options. We don't want to pass the same options + # in the UCLIBC_EXTRA_CFLAGS again (on some targets, the options do not correctly + # override each other). On the other hand, we do not want to lose the options + # that are not reflected in the .config. + extra_cflags="-pipe" + { echo "include Rules.mak"; echo "show-cpu-flags:"; printf '\t@echo $(CPU_CFLAGS)\n'; } \ + > .show-cpu-cflags.mk + cfg_cflags=$( make "${make_args[@]}" \ + --no-print-directory -f .show-cpu-cflags.mk show-cpu-flags ) + CT_DoExecLog ALL rm -f .show-cpu-cflags.mk + CT_DoLog DEBUG "CPU_CFLAGS detected by uClibc: ${cfg_cflags[@]}" + for f in ${multi_flags}; do + for cf in ${cfg_cflags}; do + if [ "${f}" = "${cf}" ]; then + f= + break + fi + done + if [ -n "${f}" ]; then + extra_cflags+=" ${f}" + fi + done + CT_DoLog DEBUG "Filtered multilib CFLAGS: ${extra_cflags}" + make_args+=( UCLIBC_EXTRA_CFLAGS="${extra_cflags}" ) + + # uClibc does not have a way to select the installation subdirectory for headers, + # it is always $(DEVEL_PREFIX)/include. Also, we're reinstalling the headers + # at the final stage (see the note below), we may already have the subdirectory + # in /usr/include. + CT_DoArchUClibcHeaderDir hdr_install_subdir "${multi_flags}" + if [ -n "${hdr_install_subdir}" ]; then + CT_DoExecLog ALL cp -a "${multi_root}/usr/include" "${multi_root}/usr/include.saved" + fi + + if [ "${libc_mode}" = "startfiles" ]; then + CT_DoLog EXTRA "Building headers" + CT_DoExecLog ALL make "${make_args[@]}" headers + + # Ensure the directory for installing multilib-specific binaries exists. + CT_DoExecLog ALL mkdir -p "${startfiles_dir}" + + CT_DoLog EXTRA "Installing headers" + CT_DoExecLog ALL make "${make_args[@]}" install_headers + + # The check might look bogus, but it is the same condition as is used + # by GCC build script to enable/disable shared library support. + if [ "${CT_THREADS}" = "nptl" ]; then + CT_DoLog EXTRA "Building start files" + CT_DoExecLog ALL make ${jflag} "${make_args[@]}" \ + lib/crt1.o lib/crti.o lib/crtn.o + + if [ "${CT_SHARED_LIBS}" = "y" ]; then + # From: http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=ad5668a7ac7e0436db92e55caaf3fdf782b6ba3b + # libm.so is needed for ppc, as libgcc is linked against libm.so + # No problem to create it for other archs. + CT_DoLog EXTRA "Building dummy shared libs" + CT_DoExecLog ALL "${CT_TARGET}-${CT_CC}" -nostdlib -nostartfiles \ + -shared ${multi_flags} -x c /dev/null -o libdummy.so + + CT_DoLog EXTRA "Installing start files" + CT_DoExecLog ALL install -m 0644 lib/crt1.o lib/crti.o lib/crtn.o \ + "${startfiles_dir}" + + CT_DoLog EXTRA "Installing dummy shared libs" + CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libc.so" + CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libm.so" + fi # CT_SHARED_LIBS == y + fi # CT_THREADS == nptl + fi # libc_mode == startfiles + + if [ "${libc_mode}" = "final" ]; then + CT_DoLog EXTRA "Cleaning up startfiles" + CT_DoExecLog ALL rm -f "${startfiles_dir}/crt1.o" \ + "${startfiles_dir}/crti.o" \ + "${startfiles_dir}/crtn.o" \ + "${startfiles_dir}/libc.so" \ + "${startfiles_dir}/libm.so" + + CT_DoLog EXTRA "Building C library" + CT_DoExecLog ALL make "${make_args[@]}" pregen + CT_DoExecLog ALL make ${jflag} "${make_args[@]}" all + + # YEM-FIXME: + # - we want to install 'runtime' files, eg. lib*.{a,so*}, crti.o and + # such files, except the headers as they already are installed + # - "make install_dev" installs the headers, the crti.o... and the + # static libs, but not the dynamic libs + # - "make install_runtime" installs the dynamic libs only + # - "make install" calls install_runtime and install_dev + # - so we're left with re-installing the headers... Sigh... + CT_DoLog EXTRA "Installing C library" + CT_DoExecLog ALL make "${make_args[@]}" install install_utils + fi # libc_mode == final + + # Now, if installing headers into a subdirectory, put everything in its place. + # Remove the header subdirectory if it existed already. + if [ -n "${hdr_install_subdir}" ]; then + CT_DoExecLog ALL mv "${multi_root}/usr/include" "${multi_root}/usr/include.new" + CT_DoExecLog ALL mv "${multi_root}/usr/include.saved" "${multi_root}/usr/include" + CT_DoExecLog ALL rm -rf "${multi_root}/usr/include/${hdr_install_subdir}" + CT_DoExecLog ALL mv "${multi_root}/usr/include.new" "${multi_root}/usr/include/${hdr_install_subdir}" + fi + + CT_EndStep +} + +# Initialises the .config file to sensible values +# $1: original file +# $2: modified file +manage_uClibc_config() +{ + src="$1" + dst="$2" + flags="$3" + + # Start with fresh files + CT_DoExecLog ALL cp "${src}" "${dst}" + + case "${CT_ARCH_ENDIAN}" in + big|big,little) + CT_KconfigDisableOption "ARCH_LITTLE_ENDIAN" "${dst}" + CT_KconfigDisableOption "ARCH_WANTS_LITTLE_ENDIAN" "${dst}" + CT_KconfigEnableOption "ARCH_BIG_ENDIAN" "${dst}" + CT_KconfigEnableOption "ARCH_WANTS_BIG_ENDIAN" "${dst}" + ;; + little|little,big) + CT_KconfigDisableOption "ARCH_BIG_ENDIAN" "${dst}" + CT_KconfigDisableOption "ARCH_WANTS_BIG_ENDIAN" "${dst}" + CT_KconfigEnableOption "ARCH_LITTLE_ENDIAN" "${dst}" + CT_KconfigEnableOption "ARCH_WANTS_LITTLE_ENDIAN" "${dst}" + ;; + esac + + if [ "${CT_ARCH_USE_MMU}" = "y" ]; then + CT_KconfigEnableOption "ARCH_USE_MMU" "${dst}" + else + CT_KconfigDisableOption "ARCH_USE_MMU" "${dst}" + CT_KconfigDisableOption "UCLIBC_FORMAT_FDPIC" "${dst}" + CT_KconfigDisableOption "UCLIBC_FORMAT_FLAT" "${dst}" + CT_KconfigDisableOption "UCLIBC_FORMAT_SHARED_FLAT" "${dst}" + case "${CT_ARCH_BINFMT_FLAT},${CT_ARCH_BINFMT_FDPIC},${CT_SHARED_LIBS}" in + y,,y) CT_KconfigEnableOption "UCLIBC_FORMAT_SHARED_FLAT" "${dst}";; + y,,) CT_KconfigEnableOption "UCLIBC_FORMAT_FLAT" "${dst}";; + ,y,*) CT_KconfigEnableOption "UCLIBC_FORMAT_FDPIC" "${dst}";; + *) CT_Abort "Unsupported binary format";; + esac + fi + + if [ "${CT_SHARED_LIBS}" = "y" ]; then + CT_KconfigEnableOption "HAVE_SHARED" "${dst}" + else + CT_KconfigDisableOption "HAVE_SHARED" "${dst}" + fi + + # Accomodate for old and new uClibc version, where the + # way to select between hard/soft float has changed + case "${CT_ARCH_FLOAT}" in + hard|softfp) + CT_KconfigEnableOption "UCLIBC_HAS_FPU" "${dst}" + CT_KconfigEnableOption "UCLIBC_HAS_FLOATS" "${dst}" + ;; + soft) + CT_KconfigDisableOption "UCLIBC_HAS_FPU" "${dst}" + CT_KconfigEnableOption "UCLIBC_HAS_FLOATS" "${dst}" + CT_KconfigEnableOption "DO_C99_MATH" "${dst}" + ;; + esac + if [ "${CT_LIBC_UCLIBC_FENV}" = "y" ]; then + CT_KconfigEnableOption "UCLIBC_HAS_FENV" "${dst}" + else + CT_KconfigDisableOption "UCLIBC_HAS_FENV" "${dst}" + fi + if [ "${CT_LIBC_UCLIBC_RPC}" = "y" ]; then + CT_KconfigEnableOption "UCLIBC_HAS_RPC" "${dst}" + else + CT_KconfigDisableOption "UCLIBC_HAS_RPC" "${dst}" + fi + + # We always want ctor/dtor + CT_KconfigEnableOption "UCLIBC_CTOR_DTOR" "${dst}" + + # Change paths to work with crosstool-NG + # + # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX, + # which is the correct value of ${PREFIX}/${TARGET}. + CT_KconfigSetOption "DEVEL_PREFIX" "\"/usr/\"" "${dst}" + CT_KconfigSetOption "RUNTIME_PREFIX" "\"/\"" "${dst}" + CT_KconfigSetOption "KERNEL_HEADERS" "\"${CT_HEADERS_DIR}\"" "${dst}" + + # Locales support + # Note that the two PREGEN_LOCALE and the XLOCALE lines may be missing + # entirely if LOCALE is not set. If LOCALE was already set, we'll + # assume the user has already made all the appropriate generation + # arrangements. Note that having the uClibc Makefile download the + # pregenerated locales is not compatible with crosstool. + if [ -z "${CT_LIBC_UCLIBC_LOCALES}" ]; then + CT_KconfigDisableOption "UCLIBC_HAS_LOCALE" "${dst}" + else + CT_KconfigEnableOption "UCLIBC_HAS_LOCALE" "${dst}" + CT_KconfigDeleteOption "UCLIBC_PREGENERATED_LOCALE_DATA" "${dst}" + CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" "${dst}" + fi + + # WCHAR support + if [ "${CT_LIBC_UCLIBC_WCHAR}" = "y" ]; then + CT_KconfigEnableOption "UCLIBC_HAS_WCHAR" "${dst}" + else + CT_KconfigDisableOption "UCLIBC_HAS_WCHAR" "${dst}" + fi + + # IPv6 support + if [ "${CT_LIBC_UCLIBC_IPV6}" = "y" ]; then + CT_KconfigEnableOption "UCLIBC_HAS_IPV6" "${dst}" + else + CT_KconfigDisableOption "UCLIBC_HAS_IPV6" "${dst}" + fi + + # Iconv support + if [ "${CT_LIBC_UCLIBC_LIBICONV}" = "y" ]; then + CT_KconfigEnableOption "UCLIBC_HAS_LIBICONV" "${dst}" + else + CT_KconfigDisableOption "UCLIBC_HAS_LIBICONV" "${dst}" + fi + + # Force on options needed for C++ if we'll be making a C++ compiler. + # I'm not sure locales are a requirement for doing C++... Are they? + if [ "${CT_CC_LANG_CXX}" = "y" ]; then + CT_KconfigEnableOption "DO_C99_MATH" "${dst}" + CT_KconfigEnableOption "UCLIBC_HAS_GNU_GETOPT" "${dst}" + fi + + # Stack Smash Protection (SSP) + if [ "${CT_LIBC_UCLIBC_HAS_SSP}" = "y" ]; then + CT_KconfigEnableOption "UCLIBC_HAS_SSP" "${dst}" + else + CT_KconfigDisableOption "UCLIBC_HAS_SSP" "${dst}" + fi + if [ "${CT_LIBC_UCLIBC_BUILD_SSP}" = "y" ]; then + CT_KconfigEnableOption "UCLIBC_BUILD_SSP" "${dst}" + else + CT_KconfigDisableOption "UCLIBC_BUILD_SSP" "${dst}" + fi + + # Push the threading model + CT_KconfigDisableOption "UCLIBC_HAS_THREADS" "${dst}" + CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}" + CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}" + CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}" + case "${CT_THREADS}" in + none) + ;; + linuxthreads) + CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}" + CT_KconfigEnableOption "UCLIBC_HAS_LINUXTHREADS" "${dst}" + ;; + nptl) + CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}" + CT_KconfigEnableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}" + ;; + *) + CT_Abort "Incorrect thread settings: CT_THREADS='${CT_THREADS}'" + ;; + esac + + # Always build the libpthread_db + CT_KconfigEnableOption "PTHREADS_DEBUG_SUPPORT" "${dst}" + + # Force on debug options if asked for + CT_KconfigDisableOption "DODEBUG" "${dst}" + CT_KconfigDisableOption "DODEBUG_PT" "${dst}" + CT_KconfigDisableOption "DOASSERTS" "${dst}" + CT_KconfigDisableOption "SUPPORT_LD_DEBUG" "${dst}" + CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}" + CT_KconfigDisableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}" + case "${CT_LIBC_UCLIBC_DEBUG_LEVEL}" in + 0) + ;; + 1) + CT_KconfigEnableOption "DODEBUG" "${dst}" + ;; + 2) + CT_KconfigEnableOption "DODEBUG" "${dst}" + CT_KconfigEnableOption "DOASSERTS" "${dst}" + CT_KconfigEnableOption "SUPPORT_LD_DEBUG" "${dst}" + CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}" + ;; + 3) + CT_KconfigEnableOption "DODEBUG" "${dst}" + CT_KconfigEnableOption "DODEBUG_PT" "${dst}" + CT_KconfigEnableOption "DOASSERTS" "${dst}" + CT_KconfigEnableOption "SUPPORT_LD_DEBUG" "${dst}" + CT_KconfigEnableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}" + CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}" + ;; + esac + + # Remove stripping: its the responsibility of the + # firmware builder to strip or not. + CT_KconfigDisableOption "DOSTRIP" "${dst}" + + # Now allow architecture to tweak as it wants + CT_DoArchUClibcConfig "${dst}" + CT_DoArchUClibcCflags "${dst}" "${flags}" + + # Preserve the config we created (before uclibc's `make olddefconfig` + # overrides anything). + CT_DoExecLog ALL cp "${dst}" "${dst}.created-by-ct-ng" +} + +uClibc_ng_post_cc() +{ + # uClibc and GCC disagree where the dynamic linker lives. uClibc always + # places it in the MULTILIB_DIR, while gcc does that for *some* variants + # and expects it in /lib for the other. So, create a symlink from lib + # to the actual location, but only if that will not override the actual + # file in /lib. Thus, need to do this after all the variants are built. + # Moreover, need to do this after the final compiler is built: on targets + # that use elf2flt, the core compilers cannot find ld when running elf2flt. + CT_MultilibFixupLDSO + + if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then + CT_InstallConfigurationFile "${CT_LIBC_UCLIBC_CONFIG_FILE}" libc + fi +} diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh deleted file mode 100644 index 4328542..0000000 --- a/scripts/build/libc/uClibc.sh +++ /dev/null @@ -1,437 +0,0 @@ -# This file declares functions to install the uClibc C library -# Copyright 2007 Yann E. MORIN -# Licensed under the GPL v2. See COPYING in the root of this package - -# Build and install headers and start files -uClibc_start_files() -{ - # Start files and Headers should be configured the same way as the - # final libc, but built and installed differently. - uClibc_backend libc_mode=startfiles -} - -# This function builds and install the full C library -uClibc_main() -{ - uClibc_backend libc_mode=final -} - -# Common backend for 1st and 2nd passes. -uClibc_backend() -{ - local libc_mode - local arg - - for arg in "$@"; do - eval "${arg// /\\ }" - done - - case "${libc_mode}" in - startfiles) CT_DoStep INFO "Installing C library headers & start files";; - final) CT_DoStep INFO "Installing C library";; - *) CT_Abort "Unsupported (or unset) libc_mode='${libc_mode}'";; - esac - - CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc-${libc_mode}" - CT_IterateMultilibs uClibc_backend_once multilib libc_mode="${libc_mode}" - CT_Popd - CT_EndStep -} - -# Common backend for 1st and 2nd passes, once per multilib. -uClibc_backend_once() -{ - local libc_mode - local multi_dir multi_os_dir multi_root multi_flags multi_index multi_count - local multilib_dir startfiles_dir - local jflag=${CT_LIBC_UCLIBC_PARALLEL:+${CT_JOBSFLAGS}} - local -a make_args - local extra_cflags f cfg_cflags cf - local hdr_install_subdir - local uClibc_name - - for arg in "$@"; do - eval "${arg// /\\ }" - done - - if [ "${CT_UCLIBC_USE_UCLIBC_NG_ORG}" = "y" ]; then - uClibc_name="uClibc-ng" - elif [ "${CT_UCLIBC_USE_UCLIBC_ORG}" = "y" ]; then - uClibc_name="uClibc" - fi - - CT_DoStep INFO "Building for multilib ${multi_index}/${multi_count}: '${multi_flags}'" - - multilib_dir="lib/${multi_os_dir}" - startfiles_dir="${multi_root}/usr/${multilib_dir}" - CT_SanitizeVarDir multilib_dir startfiles_dir - - # Construct make arguments: - # - uClibc uses the CROSS environment variable as a prefix to the compiler - # tools to use. Since it requires core pass-1, thusly named compiler is - # already available. - # - Note about CFLAGS: In uClibc, CFLAGS are generated by Rules.mak, - # depending on the configuration of the library. That is, they are tailored - # to best fit the target. So it is useless and seems to be a bad thing to - # use LIBC_EXTRA_CFLAGS here. - # - We do _not_ want to strip anything for now, in case we specifically - # asked for a debug toolchain, thus the STRIPTOOL= assignment. - make_args=( CROSS_COMPILE="${CT_TARGET}-" \ - HOSTCC="${CT_BUILD}-gcc" \ - PREFIX="${multi_root}/" \ - MULTILIB_DIR="${multilib_dir}" \ - STRIPTOOL=true \ - ${CT_LIBC_UCLIBC_VERBOSITY} \ - ) - - # Simply copy files until uClibc has the ability to build out-of-tree - CT_DoLog EXTRA "Copying sources to build dir" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc/." . - - # Force the date of the pregen locale data, as the - # newer ones that are referenced are not available - CT_DoLog EXTRA "Applying configuration" - - # Use the default config if the user did not provide one. - if [ -z "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then - CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/packages/${uClibc_name}/config" - fi - - manage_uClibc_config "${CT_LIBC_UCLIBC_CONFIG_FILE}" .config "${multi_flags}" - CT_DoExecLog ALL make "${make_args[@]}" olddefconfig - - # Now filter the multilib flags. manage_uClibc_config did the opposite of - # what Rules.mak in uClibc would do: by the multilib's CFLAGS, it determined - # the applicable configuration options. We don't want to pass the same options - # in the UCLIBC_EXTRA_CFLAGS again (on some targets, the options do not correctly - # override each other). On the other hand, we do not want to lose the options - # that are not reflected in the .config. - extra_cflags="-pipe" - { echo "include Rules.mak"; echo "show-cpu-flags:"; printf '\t@echo $(CPU_CFLAGS)\n'; } \ - > .show-cpu-cflags.mk - cfg_cflags=$( make "${make_args[@]}" \ - --no-print-directory -f .show-cpu-cflags.mk show-cpu-flags ) - CT_DoExecLog ALL rm -f .show-cpu-cflags.mk - CT_DoLog DEBUG "CPU_CFLAGS detected by uClibc: ${cfg_cflags[@]}" - for f in ${multi_flags}; do - for cf in ${cfg_cflags}; do - if [ "${f}" = "${cf}" ]; then - f= - break - fi - done - if [ -n "${f}" ]; then - extra_cflags+=" ${f}" - fi - done - CT_DoLog DEBUG "Filtered multilib CFLAGS: ${extra_cflags}" - make_args+=( UCLIBC_EXTRA_CFLAGS="${extra_cflags}" ) - - # uClibc does not have a way to select the installation subdirectory for headers, - # it is always $(DEVEL_PREFIX)/include. Also, we're reinstalling the headers - # at the final stage (see the note below), we may already have the subdirectory - # in /usr/include. - CT_DoArchUClibcHeaderDir hdr_install_subdir "${multi_flags}" - if [ -n "${hdr_install_subdir}" ]; then - CT_DoExecLog ALL cp -a "${multi_root}/usr/include" "${multi_root}/usr/include.saved" - fi - - if [ "${libc_mode}" = "startfiles" ]; then - CT_DoLog EXTRA "Building headers" - CT_DoExecLog ALL make "${make_args[@]}" headers - - # Ensure the directory for installing multilib-specific binaries exists. - CT_DoExecLog ALL mkdir -p "${startfiles_dir}" - - CT_DoLog EXTRA "Installing headers" - CT_DoExecLog ALL make "${make_args[@]}" install_headers - - # The check might look bogus, but it is the same condition as is used - # by GCC build script to enable/disable shared library support. - if [ "${CT_THREADS}" = "nptl" ]; then - CT_DoLog EXTRA "Building start files" - CT_DoExecLog ALL make ${jflag} "${make_args[@]}" \ - lib/crt1.o lib/crti.o lib/crtn.o - - if [ "${CT_SHARED_LIBS}" = "y" ]; then - # From: http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=ad5668a7ac7e0436db92e55caaf3fdf782b6ba3b - # libm.so is needed for ppc, as libgcc is linked against libm.so - # No problem to create it for other archs. - CT_DoLog EXTRA "Building dummy shared libs" - CT_DoExecLog ALL "${CT_TARGET}-${CT_CC}" -nostdlib -nostartfiles \ - -shared ${multi_flags} -x c /dev/null -o libdummy.so - - CT_DoLog EXTRA "Installing start files" - CT_DoExecLog ALL install -m 0644 lib/crt1.o lib/crti.o lib/crtn.o \ - "${startfiles_dir}" - - CT_DoLog EXTRA "Installing dummy shared libs" - CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libc.so" - CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libm.so" - fi # CT_SHARED_LIBS == y - fi # CT_THREADS == nptl - fi # libc_mode == startfiles - - if [ "${libc_mode}" = "final" ]; then - CT_DoLog EXTRA "Cleaning up startfiles" - CT_DoExecLog ALL rm -f "${startfiles_dir}/crt1.o" \ - "${startfiles_dir}/crti.o" \ - "${startfiles_dir}/crtn.o" \ - "${startfiles_dir}/libc.so" \ - "${startfiles_dir}/libm.so" - - CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL make "${make_args[@]}" pregen - CT_DoExecLog ALL make ${jflag} "${make_args[@]}" all - - # YEM-FIXME: - # - we want to install 'runtime' files, eg. lib*.{a,so*}, crti.o and - # such files, except the headers as they already are installed - # - "make install_dev" installs the headers, the crti.o... and the - # static libs, but not the dynamic libs - # - "make install_runtime" installs the dynamic libs only - # - "make install" calls install_runtime and install_dev - # - so we're left with re-installing the headers... Sigh... - CT_DoLog EXTRA "Installing C library" - CT_DoExecLog ALL make "${make_args[@]}" install install_utils - fi # libc_mode == final - - # Now, if installing headers into a subdirectory, put everything in its place. - # Remove the header subdirectory if it existed already. - if [ -n "${hdr_install_subdir}" ]; then - CT_DoExecLog ALL mv "${multi_root}/usr/include" "${multi_root}/usr/include.new" - CT_DoExecLog ALL mv "${multi_root}/usr/include.saved" "${multi_root}/usr/include" - CT_DoExecLog ALL rm -rf "${multi_root}/usr/include/${hdr_install_subdir}" - CT_DoExecLog ALL mv "${multi_root}/usr/include.new" "${multi_root}/usr/include/${hdr_install_subdir}" - fi - - CT_EndStep -} - -# Initialises the .config file to sensible values -# $1: original file -# $2: modified file -manage_uClibc_config() -{ - src="$1" - dst="$2" - flags="$3" - - # Start with fresh files - CT_DoExecLog ALL cp "${src}" "${dst}" - - case "${CT_ARCH_ENDIAN}" in - big|big,little) - CT_KconfigDisableOption "ARCH_LITTLE_ENDIAN" "${dst}" - CT_KconfigDisableOption "ARCH_WANTS_LITTLE_ENDIAN" "${dst}" - CT_KconfigEnableOption "ARCH_BIG_ENDIAN" "${dst}" - CT_KconfigEnableOption "ARCH_WANTS_BIG_ENDIAN" "${dst}" - ;; - little|little,big) - CT_KconfigDisableOption "ARCH_BIG_ENDIAN" "${dst}" - CT_KconfigDisableOption "ARCH_WANTS_BIG_ENDIAN" "${dst}" - CT_KconfigEnableOption "ARCH_LITTLE_ENDIAN" "${dst}" - CT_KconfigEnableOption "ARCH_WANTS_LITTLE_ENDIAN" "${dst}" - ;; - esac - - if [ "${CT_ARCH_USE_MMU}" = "y" ]; then - CT_KconfigEnableOption "ARCH_USE_MMU" "${dst}" - else - CT_KconfigDisableOption "ARCH_USE_MMU" "${dst}" - CT_KconfigDisableOption "UCLIBC_FORMAT_FDPIC" "${dst}" - CT_KconfigDisableOption "UCLIBC_FORMAT_FLAT" "${dst}" - CT_KconfigDisableOption "UCLIBC_FORMAT_SHARED_FLAT" "${dst}" - case "${CT_ARCH_BINFMT_FLAT},${CT_ARCH_BINFMT_FDPIC},${CT_SHARED_LIBS}" in - y,,y) CT_KconfigEnableOption "UCLIBC_FORMAT_SHARED_FLAT" "${dst}";; - y,,) CT_KconfigEnableOption "UCLIBC_FORMAT_FLAT" "${dst}";; - ,y,*) CT_KconfigEnableOption "UCLIBC_FORMAT_FDPIC" "${dst}";; - *) CT_Abort "Unsupported binary format";; - esac - fi - - if [ "${CT_SHARED_LIBS}" = "y" ]; then - CT_KconfigEnableOption "HAVE_SHARED" "${dst}" - else - CT_KconfigDisableOption "HAVE_SHARED" "${dst}" - fi - - # Accomodate for old and new uClibc version, where the - # way to select between hard/soft float has changed - case "${CT_ARCH_FLOAT}" in - hard|softfp) - CT_KconfigEnableOption "UCLIBC_HAS_FPU" "${dst}" - CT_KconfigEnableOption "UCLIBC_HAS_FLOATS" "${dst}" - ;; - soft) - CT_KconfigDisableOption "UCLIBC_HAS_FPU" "${dst}" - CT_KconfigEnableOption "UCLIBC_HAS_FLOATS" "${dst}" - CT_KconfigEnableOption "DO_C99_MATH" "${dst}" - ;; - esac - if [ "${CT_LIBC_UCLIBC_FENV}" = "y" ]; then - CT_KconfigEnableOption "UCLIBC_HAS_FENV" "${dst}" - else - CT_KconfigDisableOption "UCLIBC_HAS_FENV" "${dst}" - fi - if [ "${CT_LIBC_UCLIBC_RPC}" = "y" ]; then - CT_KconfigEnableOption "UCLIBC_HAS_RPC" "${dst}" - else - CT_KconfigDisableOption "UCLIBC_HAS_RPC" "${dst}" - fi - - # We always want ctor/dtor - CT_KconfigEnableOption "UCLIBC_CTOR_DTOR" "${dst}" - - # Change paths to work with crosstool-NG - # - # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX, - # which is the correct value of ${PREFIX}/${TARGET}. - CT_KconfigSetOption "DEVEL_PREFIX" "\"/usr/\"" "${dst}" - CT_KconfigSetOption "RUNTIME_PREFIX" "\"/\"" "${dst}" - CT_KconfigSetOption "KERNEL_HEADERS" "\"${CT_HEADERS_DIR}\"" "${dst}" - - # Locales support - # Note that the two PREGEN_LOCALE and the XLOCALE lines may be missing - # entirely if LOCALE is not set. If LOCALE was already set, we'll - # assume the user has already made all the appropriate generation - # arrangements. Note that having the uClibc Makefile download the - # pregenerated locales is not compatible with crosstool. - if [ -z "${CT_LIBC_UCLIBC_LOCALES}" ]; then - CT_KconfigDisableOption "UCLIBC_HAS_LOCALE" "${dst}" - else - CT_KconfigEnableOption "UCLIBC_HAS_LOCALE" "${dst}" - CT_KconfigDeleteOption "UCLIBC_PREGENERATED_LOCALE_DATA" "${dst}" - CT_KconfigDeleteOption "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" "${dst}" - fi - - # WCHAR support - if [ "${CT_LIBC_UCLIBC_WCHAR}" = "y" ]; then - CT_KconfigEnableOption "UCLIBC_HAS_WCHAR" "${dst}" - else - CT_KconfigDisableOption "UCLIBC_HAS_WCHAR" "${dst}" - fi - - # IPv6 support - if [ "${CT_LIBC_UCLIBC_IPV6}" = "y" ]; then - CT_KconfigEnableOption "UCLIBC_HAS_IPV6" "${dst}" - else - CT_KconfigDisableOption "UCLIBC_HAS_IPV6" "${dst}" - fi - - # Iconv support - if [ "${CT_LIBC_UCLIBC_LIBICONV}" = "y" ]; then - CT_KconfigEnableOption "UCLIBC_HAS_LIBICONV" "${dst}" - else - CT_KconfigDisableOption "UCLIBC_HAS_LIBICONV" "${dst}" - fi - - # Force on options needed for C++ if we'll be making a C++ compiler. - # I'm not sure locales are a requirement for doing C++... Are they? - if [ "${CT_CC_LANG_CXX}" = "y" ]; then - CT_KconfigEnableOption "DO_C99_MATH" "${dst}" - CT_KconfigEnableOption "UCLIBC_HAS_GNU_GETOPT" "${dst}" - fi - - # Stack Smash Protection (SSP) - if [ "${CT_LIBC_UCLIBC_HAS_SSP}" = "y" ]; then - CT_KconfigEnableOption "UCLIBC_HAS_SSP" "${dst}" - else - CT_KconfigDisableOption "UCLIBC_HAS_SSP" "${dst}" - fi - if [ "${CT_LIBC_UCLIBC_BUILD_SSP}" = "y" ]; then - CT_KconfigEnableOption "UCLIBC_BUILD_SSP" "${dst}" - else - CT_KconfigDisableOption "UCLIBC_BUILD_SSP" "${dst}" - fi - - # Push the threading model - CT_KconfigDisableOption "UCLIBC_HAS_THREADS" "${dst}" - CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}" - CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}" - CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}" - case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in - none:) - ;; - linuxthreads:) - # Newer version of uClibc-ng, no old/new dichotomy - CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}" - CT_KconfigEnableOption "UCLIBC_HAS_LINUXTHREADS" "${dst}" - ;; - linuxthreads:old) - CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}" - CT_KconfigEnableOption "LINUXTHREADS_OLD" "${dst}" - ;; - linuxthreads:new) - CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}" - CT_KconfigEnableOption "LINUXTHREADS_NEW" "${dst}" - ;; - nptl:) - CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}" - CT_KconfigEnableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}" - ;; - *) - CT_Abort "Incorrect thread settings: CT_THREADS='${CT_THREAD}' CT_LIBC_UCLIBC_LNXTHRD='${CT_LIBC_UCLIBC_LNXTHRD}'" - ;; - esac - - # Always build the libpthread_db - CT_KconfigEnableOption "PTHREADS_DEBUG_SUPPORT" "${dst}" - - # Force on debug options if asked for - CT_KconfigDisableOption "DODEBUG" "${dst}" - CT_KconfigDisableOption "DODEBUG_PT" "${dst}" - CT_KconfigDisableOption "DOASSERTS" "${dst}" - CT_KconfigDisableOption "SUPPORT_LD_DEBUG" "${dst}" - CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}" - CT_KconfigDisableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}" - case "${CT_LIBC_UCLIBC_DEBUG_LEVEL}" in - 0) - ;; - 1) - CT_KconfigEnableOption "DODEBUG" "${dst}" - ;; - 2) - CT_KconfigEnableOption "DODEBUG" "${dst}" - CT_KconfigEnableOption "DOASSERTS" "${dst}" - CT_KconfigEnableOption "SUPPORT_LD_DEBUG" "${dst}" - CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}" - ;; - 3) - CT_KconfigEnableOption "DODEBUG" "${dst}" - CT_KconfigEnableOption "DODEBUG_PT" "${dst}" - CT_KconfigEnableOption "DOASSERTS" "${dst}" - CT_KconfigEnableOption "SUPPORT_LD_DEBUG" "${dst}" - CT_KconfigEnableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}" - CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}" - ;; - esac - - # Remove stripping: its the responsibility of the - # firmware builder to strip or not. - CT_KconfigDisableOption "DOSTRIP" "${dst}" - - # Now allow architecture to tweak as it wants - CT_DoArchUClibcConfig "${dst}" - CT_DoArchUClibcCflags "${dst}" "${flags}" - - # Preserve the config we created (before uclibc's `make olddefconfig` - # overrides anything). - CT_DoExecLog ALL cp "${dst}" "${dst}.created-by-ct-ng" -} - -uClibc_post_cc() -{ - # uClibc and GCC disagree where the dynamic linker lives. uClibc always - # places it in the MULTILIB_DIR, while gcc does that for *some* variants - # and expects it in /lib for the other. So, create a symlink from lib - # to the actual location, but only if that will not override the actual - # file in /lib. Thus, need to do this after all the variants are built. - # Moreover, need to do this after the final compiler is built: on targets - # that use elf2flt, the core compilers cannot find ld when running elf2flt. - CT_MultilibFixupLDSO - - if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then - CT_InstallConfigurationFile "${CT_LIBC_UCLIBC_CONFIG_FILE}" libc - fi -} diff --git a/scripts/functions b/scripts/functions index da90980..2446342 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1132,7 +1132,7 @@ CT_DoBuildTargetTuple() # values. case "${CT_LIBC}" in glibc) CT_TARGET_SYS=gnu;; - uClibc) CT_TARGET_SYS=uclibc;; + uClibc-ng) CT_TARGET_SYS=uclibc;; musl) CT_TARGET_SYS=musl;; bionic) CT_TARGET_SYS=android;; none|newlib|picolibc) CT_TARGET_SYS=elf;; -- cgit v0.10.2-6-g49f6 From 196f62e18ca16a1d6408d8e80989870e4ea93ef9 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 6 Jan 2022 13:10:07 -0800 Subject: Upgrade script for uClibc retirement Run samples through upgrade and fix accumulated breakages: *-centos6-*: After 2.12.2 retirement, the samples selected most recent glibc (2.34) which also forced kernels 3.2+. Revert to 2.12.1 and 2.6.32.71, respectively. Interestingly, 2.12.1 was marked as being used in CentOS6, but the samples selected 2.12.2. Anyway, CentOS6 is EOL now and glibc 2.12 is going to be marked obsolete, and retired soon. arc-*: Make TARGET_VENDOR match the sample's name; otherwise `ct-ng saveconfig` places the config file into a different location. Fix 'savedefconfig' which was not saving the configuration file version (CT_VCHECK was set to 'load' after CT_LoadConfig call). Signed-off-by: Alexey Neyman diff --git a/ct-ng.in b/ct-ng.in index 0be52ad..05ca29d 100644 --- a/ct-ng.in +++ b/ct-ng.in @@ -41,7 +41,7 @@ export CT_VCHECK= # need to pass it to the upgrade script - which may receive an input that # was not preprocessed by kconfig, and hence have no string for "up-to-date" # version. -export CT_CONFIG_VERSION_CURRENT=3 +export CT_CONFIG_VERSION_CURRENT=4 # Download agents used by scripts.mk CT_WGET := @wget@ diff --git a/samples/arc-arc700-linux-uclibc/crosstool.config b/samples/arc-arc700-linux-uclibc/crosstool.config index caa0cf1..93305e5 100644 --- a/samples/arc-arc700-linux-uclibc/crosstool.config +++ b/samples/arc-arc700-linux-uclibc/crosstool.config @@ -1,8 +1,8 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_ARCH_CPU="arc700" CT_TARGET_CFLAGS="-mno-atomic" -CT_TARGET_VENDOR="snps" +CT_TARGET_VENDOR="arc700" CT_TARGET_ALIAS="arc-linux" CT_KERNEL_LINUX=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y diff --git a/samples/arc-archs-linux-gnu/crosstool.config b/samples/arc-archs-linux-gnu/crosstool.config index ad39f70..dfeb1ed 100644 --- a/samples/arc-archs-linux-gnu/crosstool.config +++ b/samples/arc-archs-linux-gnu/crosstool.config @@ -1,6 +1,6 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_ARCH_CPU="archs" -CT_TARGET_VENDOR="snps" +CT_TARGET_VENDOR="archs" CT_TARGET_ALIAS="arc-linux" CT_KERNEL_LINUX=y diff --git a/samples/arc-multilib-elf32/crosstool.config b/samples/arc-multilib-elf32/crosstool.config index 0cc3cdd..e2bce98 100644 --- a/samples/arc-multilib-elf32/crosstool.config +++ b/samples/arc-multilib-elf32/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_MULTILIB=y CT_TARGET_VENDOR="multilib" diff --git a/samples/arc-multilib-linux-gnu/crosstool.config b/samples/arc-multilib-linux-gnu/crosstool.config index 3dc7802..b32c92e 100644 --- a/samples/arc-multilib-linux-gnu/crosstool.config +++ b/samples/arc-multilib-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_MULTILIB=y CT_TARGET_CFLAGS="-matomic" diff --git a/samples/arc-multilib-linux-uclibc/crosstool.config b/samples/arc-multilib-linux-uclibc/crosstool.config index b1862a5..16b7569 100644 --- a/samples/arc-multilib-linux-uclibc/crosstool.config +++ b/samples/arc-multilib-linux-uclibc/crosstool.config @@ -1,8 +1,8 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARC=y CT_MULTILIB=y CT_TARGET_CFLAGS="-matomic" CT_TARGET_VENDOR="multilib" CT_TARGET_ALIAS="arc-linux" CT_KERNEL_LINUX=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config index cb7f713..ffdb905 100644 --- a/samples/i686-centos6-linux-gnu/crosstool.config +++ b/samples/i686-centos6-linux-gnu/crosstool.config @@ -4,7 +4,5 @@ CT_ARCH_X86=y CT_ARCH_ARCH="i686" CT_TARGET_VENDOR="centos6" CT_KERNEL_LINUX=y -CT_LINUX_V_2_6_32=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_GLIBC_V_2_12_2=y CT_CC_LANG_CXX=y diff --git a/samples/samples.mk b/samples/samples.mk index 48bbbb9..51e9619 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -128,7 +128,7 @@ samples: # Save a sample saveconfig: .config samples - $(SILENT)CT_VCHECK=save CONF=$(CONF) $(bash) $(CT_LIB_DIR)/scripts/saveSample.sh + $(SILENT)CONF=$(CONF) $(bash) $(CT_LIB_DIR)/scripts/saveSample.sh # The 'sample_dir' function prints the directory in which the sample is, # searching first in local samples, then in global samples diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config index 24e8a11..e9747cd 100644 --- a/samples/x86_64-centos6-linux-gnu/crosstool.config +++ b/samples/x86_64-centos6-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_X86=y CT_ARCH_64=y @@ -6,5 +6,7 @@ CT_TARGET_VENDOR="centos6" CT_KERNEL_LINUX=y CT_LINUX_V_2_6_32=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_GLIBC_V_2_12_2=y +CT_GLIBC_V_2_12_1=y +CT_GLIBC_EXTRA_CFLAGS="" +# CT_GLIBC_ENABLE_COMMON_FLAG is not set CT_CC_LANG_CXX=y diff --git a/scripts/saveSample.sh b/scripts/saveSample.sh index 2f4a10b..e367e6e 100644 --- a/scripts/saveSample.sh +++ b/scripts/saveSample.sh @@ -11,6 +11,10 @@ CT_LoadConfig +# Override CT_VCHECK: we're going to be saving it so need to force saving of +# the config version. +export CT_VCHECK=save + # We can not reliably save a sample which either uses local patches # and/or custom Linux kernel headers. Warn the user about this issue # and continue if he/she confirms sving the sample. diff --git a/scripts/upgrade/v3 b/scripts/upgrade/v3 new file mode 100644 index 0000000..1b8fce8 --- /dev/null +++ b/scripts/upgrade/v3 @@ -0,0 +1,12 @@ +# vim: set filetype=sh : + +# Upgrade v3 -> v4: +# - uClibc retired, leaving only uClibc-ng +upgrade() +{ + case "${opt}" in + CT_LIBC_UCLIBC) + replace CT_LIBC_UCLIBC_NG + ;; + esac +} -- cgit v0.10.2-6-g49f6 From 858f939436b7c0c71dd4556485ce411ffe6f25d0 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 17 Jan 2022 14:16:52 -0800 Subject: More sample config updates *-moxie*: DTC_VERBOSE is a wobbler, it depends on whether dtc is enabled on the host machine (if dtc is installed, DTC defaults to 'n' and hence prevents DTC_VERBOSE from appearing at all). Remove the option from config file so that its value reverts to the default. xtensa-fsf-elf: mark configuration obsolete so that it can use GDB 8.1 (it uses custom sources and needs to select the version therein) Signed-off-by: Alexey Neyman diff --git a/samples/aarch64-ol7u9-linux-gnu/crosstool.config b/samples/aarch64-ol7u9-linux-gnu/crosstool.config index ae644e6..d6b538e 100644 --- a/samples/aarch64-ol7u9-linux-gnu/crosstool.config +++ b/samples/aarch64-ol7u9-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_ARM=y CT_ARCH_64=y diff --git a/samples/aarch64-rpi3-linux-gnu/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config index dc9f364..55f4a92 100644 --- a/samples/aarch64-rpi3-linux-gnu/crosstool.config +++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a53" CT_ARCH_64=y diff --git a/samples/aarch64-rpi4-linux-gnu/crosstool.config b/samples/aarch64-rpi4-linux-gnu/crosstool.config index 6324ded..63726a8 100644 --- a/samples/aarch64-rpi4-linux-gnu/crosstool.config +++ b/samples/aarch64-rpi4-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a72" CT_ARCH_64=y diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config index 9bafead..c78a1f6 100644 --- a/samples/aarch64-unknown-linux-android/crosstool.config +++ b/samples/aarch64-unknown-linux-android/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_ARM=y CT_ARCH_64=y diff --git a/samples/aarch64-unknown-linux-gnu/crosstool.config b/samples/aarch64-unknown-linux-gnu/crosstool.config index 255a005..df6f415 100644 --- a/samples/aarch64-unknown-linux-gnu/crosstool.config +++ b/samples/aarch64-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_64=y CT_TARGET_VENDOR="" diff --git a/samples/aarch64-unknown-linux-uclibc/crosstool.config b/samples/aarch64-unknown-linux-uclibc/crosstool.config index e2ac47b..a5bb45a 100644 --- a/samples/aarch64-unknown-linux-uclibc/crosstool.config +++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_64=y CT_TARGET_VENDOR="" @@ -7,7 +7,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_LANG_CXX=y CT_DEBUG_GDB=y CT_GDB_NATIVE=y diff --git a/samples/alphaev56-unknown-linux-gnu/crosstool.config b/samples/alphaev56-unknown-linux-gnu/crosstool.config index cd713cc..548190f 100644 --- a/samples/alphaev56-unknown-linux-gnu/crosstool.config +++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ALPHA_EV56=y CT_KERNEL_LINUX=y CT_BINUTILS_PLUGINS=y diff --git a/samples/alphaev67-unknown-linux-gnu/crosstool.config b/samples/alphaev67-unknown-linux-gnu/crosstool.config index 4d7aa51..5219601 100644 --- a/samples/alphaev67-unknown-linux-gnu/crosstool.config +++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ALPHA_EV67=y CT_KERNEL_LINUX=y CT_BINUTILS_PLUGINS=y diff --git a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config index 4d3a79f..10aceed 100644 --- a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config +++ b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="cortex-m3" CT_ARCH_ARM_MODE_THUMB=y diff --git a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config index 48d8dc3..271fcac 100644 --- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config +++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a15" CT_ARCH_FPU="neon-vfpv4" diff --git a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config index aa65f23..4954c52 100644 --- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config +++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a8" CT_ARCH_FLOAT_SW=y diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config index bed9894..0fd6f72 100644 --- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config +++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a5" @@ -10,7 +10,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_LANG_CXX=y CT_DEBUG_DUMA=y CT_DEBUG_GDB=y diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config index e85d440..4b7a534 100644 --- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config +++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a9" diff --git a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config index 50a7507..4f96263 100644 --- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config +++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_MULTILIB=y CT_ARCH_FLOAT_SW=y @@ -9,7 +9,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_THREADS_NONE=y CT_CC_GCC_MULTILIB_LIST="aprofile" CT_DEBUG_LTRACE=y diff --git a/samples/arm-nano-eabi/crosstool.config b/samples/arm-nano-eabi/crosstool.config index bbdcb39..7206007 100644 --- a/samples/arm-nano-eabi/crosstool.config +++ b/samples/arm-nano-eabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_MULTILIB=y CT_ARCH_FLOAT_SW=y diff --git a/samples/arm-ol7u9-linux-gnueabi/crosstool.config b/samples/arm-ol7u9-linux-gnueabi/crosstool.config index 93961af..bb12842 100644 --- a/samples/arm-ol7u9-linux-gnueabi/crosstool.config +++ b/samples/arm-ol7u9-linux-gnueabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_ARM=y CT_ARCH_FLOAT_SW=y diff --git a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config index fd33aee..1f0c9ab 100644 --- a/samples/arm-ol7u9-linux-gnueabihf/crosstool.config +++ b/samples/arm-ol7u9-linux-gnueabihf/crosstool.config @@ -1,3 +1,4 @@ +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_ARM=y CT_ARCH_FLOAT_HW=y diff --git a/samples/arm-picolibc-eabi/crosstool.config b/samples/arm-picolibc-eabi/crosstool.config index 1da1616..640f307 100644 --- a/samples/arm-picolibc-eabi/crosstool.config +++ b/samples/arm-picolibc-eabi/crosstool.config @@ -1,11 +1,11 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_MULTILIB=y CT_ARCH_FLOAT_SW=y +CT_TARGET_CFLAGS="-ftls-model=local-exec" CT_TARGET_VENDOR="picolibc" CT_LIBC_NONE=y -CT_CC_GCC_CONFIG_TLS=y -CT_TARGET_CFLAGS="-ftls-model=local-exec" CT_CC_GCC_MULTILIB_LIST="rmprofile" -CT_COMP_LIBS_PICOLIBC=y +CT_CC_GCC_CONFIG_TLS=y CT_CC_LANG_CXX=y +CT_COMP_LIBS_PICOLIBC=y diff --git a/samples/arm-unknown-eabi/crosstool.config b/samples/arm-unknown-eabi/crosstool.config index ffe0985..e54f2c9 100644 --- a/samples/arm-unknown-eabi/crosstool.config +++ b/samples/arm-unknown-eabi/crosstool.config @@ -1,11 +1,11 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_FLOAT_SW=y +CT_TARGET_CFLAGS="-ftls-model=local-exec" CT_LIBC_NEWLIB_IO_C99FMT=y CT_LIBC_NEWLIB_IO_LL=y CT_LIBC_NEWLIB_IO_FLOAT=y CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y CT_CC_LANG_CXX=y -CT_COMP_LIBS_PICOLIBC=y -CT_TARGET_CFLAGS="-ftls-model=local-exec" CT_COMP_LIBS_NEWLIB_NANO=y +CT_COMP_LIBS_PICOLIBC=y diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config index f4fc942..b26f33f 100644 --- a/samples/arm-unknown-linux-gnueabi/crosstool.config +++ b/samples/arm-unknown-linux-gnueabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" # CT_REMOVE_DOCS is not set CT_ARCH_ARM=y CT_ARCH_FLOAT_SW=y diff --git a/samples/arm-unknown-linux-musleabi/crosstool.config b/samples/arm-unknown-linux-musleabi/crosstool.config index a4d8486..a7adfeb 100644 --- a/samples/arm-unknown-linux-musleabi/crosstool.config +++ b/samples/arm-unknown-linux-musleabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_ARM=y CT_KERNEL_LINUX=y diff --git a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config index 84243cf..379c632 100644 --- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config +++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="arm926ej-s" CT_ARCH_FLOAT_SW=y @@ -7,7 +7,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_LANG_CXX=y CT_DEBUG_DUMA=y CT_DEBUG_GDB=y diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config index 633493c..3f2b5f6 100644 --- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config +++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_ARM=y CT_ARCH_CPU="arm926ej-s" @@ -8,7 +8,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_LANG_CXX=y CT_DEBUG_DUMA=y CT_DEBUG_GDB=y diff --git a/samples/armeb-unknown-eabi/crosstool.config b/samples/armeb-unknown-eabi/crosstool.config index 9e18e96..92fa0a8 100644 --- a/samples/armeb-unknown-eabi/crosstool.config +++ b/samples/armeb-unknown-eabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_BE=y CT_ARCH_FLOAT_SW=y diff --git a/samples/armeb-unknown-linux-gnueabi/crosstool.config b/samples/armeb-unknown-linux-gnueabi/crosstool.config index a030f4c..9a03b80 100644 --- a/samples/armeb-unknown-linux-gnueabi/crosstool.config +++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_BE=y CT_ARCH_ARCH="armv5te" diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config index ad24f4d..9b701f5 100644 --- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config +++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="xscale" CT_ARCH_BE=y @@ -8,7 +8,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y # CT_CC_GCC_SJLJ_EXCEPTIONS is not set CT_CC_LANG_CXX=y CT_DEBUG_DUMA=y diff --git a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config index 0f1dd4d..78e9e98 100644 --- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config +++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_SUFFIX="v6" # CT_ARCH_USE_MMU is not set diff --git a/samples/armv6-unknown-linux-gnueabi/crosstool.config b/samples/armv6-unknown-linux-gnueabi/crosstool.config index c18e70a..3af9d6b 100644 --- a/samples/armv6-unknown-linux-gnueabi/crosstool.config +++ b/samples/armv6-unknown-linux-gnueabi/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="arm1176jzf-s" CT_ARCH_SUFFIX="v6" diff --git a/samples/armv6-unknown-linux-gnueabihf/crosstool.config b/samples/armv6-unknown-linux-gnueabihf/crosstool.config index 1104c7b..38c6685 100644 --- a/samples/armv6-unknown-linux-gnueabihf/crosstool.config +++ b/samples/armv6-unknown-linux-gnueabihf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="arm1176jzf-s" CT_ARCH_SUFFIX="v6" diff --git a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config index fdabda6..d3e1ea3 100644 --- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config +++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a7" CT_ARCH_SUFFIX="v7" diff --git a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config index 1197ee4..22e7b20 100644 --- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config +++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a53" CT_ARCH_SUFFIX="v8" diff --git a/samples/armv8-rpi4-linux-gnueabihf/crosstool.config b/samples/armv8-rpi4-linux-gnueabihf/crosstool.config index 309747b..5a668ed 100644 --- a/samples/armv8-rpi4-linux-gnueabihf/crosstool.config +++ b/samples/armv8-rpi4-linux-gnueabihf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a72" CT_ARCH_SUFFIX="v8" diff --git a/samples/avr/crosstool.config b/samples/avr/crosstool.config index fe4b16c..c119e88 100644 --- a/samples/avr/crosstool.config +++ b/samples/avr/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_AVR=y CT_CC_LANG_CXX=y CT_DEBUG_GDB=y diff --git a/samples/i586-geode-linux-uclibc/crosstool.config b/samples/i586-geode-linux-uclibc/crosstool.config index 87c5f92..78c90a3 100644 --- a/samples/i586-geode-linux-uclibc/crosstool.config +++ b/samples/i586-geode-linux-uclibc/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_X86=y CT_ARCH_ARCH="pentium-mmx" CT_TARGET_VENDOR="geode" @@ -7,7 +7,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_LANG_CXX=y CT_DEBUG_DUMA=y CT_DEBUG_GDB=y diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config index ffdb905..19448f9 100644 --- a/samples/i686-centos6-linux-gnu/crosstool.config +++ b/samples/i686-centos6-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_X86=y CT_ARCH_ARCH="i686" diff --git a/samples/i686-centos7-linux-gnu/crosstool.config b/samples/i686-centos7-linux-gnu/crosstool.config index 98d9fd9..dc95304 100644 --- a/samples/i686-centos7-linux-gnu/crosstool.config +++ b/samples/i686-centos7-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_X86=y CT_ARCH_ARCH="i686" diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config index 546e9cd..0a38607 100644 --- a/samples/i686-nptl-linux-gnu/crosstool.config +++ b/samples/i686-nptl-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_X86=y CT_ARCH_ARCH="i686" CT_TARGET_VENDOR="nptl" diff --git a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config deleted file mode 100644 index e5ece3e..0000000 --- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config +++ /dev/null @@ -1,10 +0,0 @@ -CT_CONFIG_VERSION="3" -CT_OBSOLETE=y -CT_ARCH_X86=y -CT_ARCH_ARCH="i686" -CT_TARGET_VENDOR="ubuntu12.04" -CT_KERNEL_LINUX=y -CT_LINUX_V_3_2=y -# CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_GLIBC_V_2_15=y -CT_CC_LANG_CXX=y diff --git a/samples/i686-ubuntu12.04-linux-gnu/reported.by b/samples/i686-ubuntu12.04-linux-gnu/reported.by deleted file mode 100644 index 97ae2f8..0000000 --- a/samples/i686-ubuntu12.04-linux-gnu/reported.by +++ /dev/null @@ -1,3 +0,0 @@ -reporter_name="Alexey Neyman" -reporter_url="" -reporter_comment="i686 kernel/libc matching Ubuntu 12.04 LTS." diff --git a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config index 50fb873..4a5bb92 100644 --- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config +++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_X86=y CT_ARCH_ARCH="i686" diff --git a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config index 6155de2..ac57a36 100644 --- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config +++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_X86=y CT_ARCH_ARCH="i686" diff --git a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config index 4e628af..2e839dd 100644 --- a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config +++ b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y # CT_REMOVE_DOCS is not set CT_ARCH_NIOS2=y diff --git a/samples/i686-w64-mingw32/crosstool.config b/samples/i686-w64-mingw32/crosstool.config index bba5738..c731d7b 100644 --- a/samples/i686-w64-mingw32/crosstool.config +++ b/samples/i686-w64-mingw32/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_X86=y CT_ARCH_ARCH="i686" diff --git a/samples/m68k-unknown-elf/crosstool.config b/samples/m68k-unknown-elf/crosstool.config index 6c8199b..4413178 100644 --- a/samples/m68k-unknown-elf/crosstool.config +++ b/samples/m68k-unknown-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_M68K=y CT_ARCH_CPU="cpu32" CT_ARCH_BINFMT_FLAT=y diff --git a/samples/m68k-unknown-uclinux-uclibc/crosstool.config b/samples/m68k-unknown-uclinux-uclibc/crosstool.config index 15cf7d0..c825d37 100644 --- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config +++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_M68K=y CT_KERNEL_LINUX=y CT_THREADS_LT=y diff --git a/samples/mips-ar2315-linux-gnu/crosstool.config b/samples/mips-ar2315-linux-gnu/crosstool.config index 51d9180..6909c66 100644 --- a/samples/mips-ar2315-linux-gnu/crosstool.config +++ b/samples/mips-ar2315-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_ARCH_TUNE="4kc" CT_ARCH_ARCH="4kc" diff --git a/samples/mips-malta-linux-gnu/crosstool.config b/samples/mips-malta-linux-gnu/crosstool.config index 2b9c8bc..c5df004 100644 --- a/samples/mips-malta-linux-gnu/crosstool.config +++ b/samples/mips-malta-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_TARGET_VENDOR="malta" CT_KERNEL_LINUX=y diff --git a/samples/mips-unknown-elf/crosstool.config b/samples/mips-unknown-elf/crosstool.config index d99ad7f..7867b9c 100644 --- a/samples/mips-unknown-elf/crosstool.config +++ b/samples/mips-unknown-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_ARCH_FLOAT_SW=y CT_LIBC_NONE=y diff --git a/samples/mips-unknown-linux-gnu/crosstool.config b/samples/mips-unknown-linux-gnu/crosstool.config index 315d20c..ea78b70 100644 --- a/samples/mips-unknown-linux-gnu/crosstool.config +++ b/samples/mips-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_ARCH_ARCH="mips1" CT_ARCH_FLOAT_SW=y diff --git a/samples/mips-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config index 001a641..882ceb0 100644 --- a/samples/mips-unknown-linux-uclibc/crosstool.config +++ b/samples/mips-unknown-linux-uclibc/crosstool.config @@ -1,10 +1,10 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_ARCH_ARCH="mips1" CT_ARCH_FLOAT_SW=y CT_KERNEL_LINUX=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_GCC_mips_plt=y CT_CC_LANG_CXX=y CT_DEBUG_DUMA=y diff --git a/samples/mips64-unknown-linux-gnu/crosstool.config b/samples/mips64-unknown-linux-gnu/crosstool.config index a33fd90..4b909ce 100644 --- a/samples/mips64-unknown-linux-gnu/crosstool.config +++ b/samples/mips64-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_ARCH_mips_n64=y CT_ARCH_64=y diff --git a/samples/mips64el-multilib-linux-uclibc/crosstool.config b/samples/mips64el-multilib-linux-uclibc/crosstool.config index 72908e5..cf97348 100644 --- a/samples/mips64el-multilib-linux-uclibc/crosstool.config +++ b/samples/mips64el-multilib-linux-uclibc/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_MULTILIB=y CT_ARCH_LE=y @@ -7,7 +7,7 @@ CT_ARCH_FLOAT_SW=y CT_TARGET_VENDOR="multilib" CT_KERNEL_LINUX=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_LIBC_UCLIBC_WCHAR=y CT_CC_GCC_mips_plt=y CT_CC_LANG_CXX=y diff --git a/samples/mipsel-multilib-linux-gnu/crosstool.config b/samples/mipsel-multilib-linux-gnu/crosstool.config index 6f1e65a..7d54e2a 100644 --- a/samples/mipsel-multilib-linux-gnu/crosstool.config +++ b/samples/mipsel-multilib-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_MULTILIB=y CT_ARCH_LE=y diff --git a/samples/mipsel-sde-elf/crosstool.config b/samples/mipsel-sde-elf/crosstool.config index 23a01a4..b3ff5af 100644 --- a/samples/mipsel-sde-elf/crosstool.config +++ b/samples/mipsel-sde-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_ARCH_LE=y CT_ARCH_FLOAT_SW=y diff --git a/samples/mipsel-unknown-linux-gnu/crosstool.config b/samples/mipsel-unknown-linux-gnu/crosstool.config index 7d6c4f2..1008591 100644 --- a/samples/mipsel-unknown-linux-gnu/crosstool.config +++ b/samples/mipsel-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_MIPS=y CT_ARCH_LE=y CT_ARCH_ARCH="mips1" diff --git a/samples/moxie-unknown-elf/crosstool.config b/samples/moxie-unknown-elf/crosstool.config index 50e0534..03d81fc 100644 --- a/samples/moxie-unknown-elf/crosstool.config +++ b/samples/moxie-unknown-elf/crosstool.config @@ -1,8 +1,7 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_MOXIE=y CT_DEBUG_GDB=y CT_GDB_CROSS_SIM=y # CT_GDB_CROSS_PYTHON is not set CT_COMP_LIBS_LIBELF=y -CT_DTC_VERBOSE=y diff --git a/samples/moxiebox/crosstool.config b/samples/moxiebox/crosstool.config index 2008fd5..fe08882 100644 --- a/samples/moxiebox/crosstool.config +++ b/samples/moxiebox/crosstool.config @@ -1,8 +1,7 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_MOXIE=y CT_ARCH_LE=y CT_DEBUG_GDB=y CT_GDB_CROSS_SIM=y # CT_GDB_CROSS_PYTHON is not set -CT_DTC_VERBOSE=y diff --git a/samples/msp430-unknown-elf/crosstool.config b/samples/msp430-unknown-elf/crosstool.config index 7eb82c9..6ca9e31 100644 --- a/samples/msp430-unknown-elf/crosstool.config +++ b/samples/msp430-unknown-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_MSP430=y CT_DEBUG_GDB=y diff --git a/samples/nios2-altera-linux-gnu/crosstool.config b/samples/nios2-altera-linux-gnu/crosstool.config index c6f51c5..d038aac 100644 --- a/samples/nios2-altera-linux-gnu/crosstool.config +++ b/samples/nios2-altera-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_NIOS2=y CT_ARCH_USE_MMU=y CT_TARGET_VENDOR="altera" diff --git a/samples/nios2-unknown-elf/crosstool.config b/samples/nios2-unknown-elf/crosstool.config index 541a5c5..2fe5d44 100644 --- a/samples/nios2-unknown-elf/crosstool.config +++ b/samples/nios2-unknown-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_NIOS2=y CT_CC_LANG_CXX=y CT_DEBUG_GDB=y diff --git a/samples/powerpc-405-linux-gnu/crosstool.config b/samples/powerpc-405-linux-gnu/crosstool.config index 21de17a..128570c 100644 --- a/samples/powerpc-405-linux-gnu/crosstool.config +++ b/samples/powerpc-405-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_ARCH_CPU="405" CT_ARCH_FLOAT_SW=y diff --git a/samples/powerpc-8540-linux-gnu/crosstool.config b/samples/powerpc-8540-linux-gnu/crosstool.config index d449c61..e6a0bf5 100644 --- a/samples/powerpc-8540-linux-gnu/crosstool.config +++ b/samples/powerpc-8540-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_ARCH_CPU="8540" # CT_DEMULTILIB is not set diff --git a/samples/powerpc-860-linux-gnu/crosstool.config b/samples/powerpc-860-linux-gnu/crosstool.config index f5a2b35..d34db5c 100644 --- a/samples/powerpc-860-linux-gnu/crosstool.config +++ b/samples/powerpc-860-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_ARCH_CPU="860" CT_ARCH_FLOAT_SW=y diff --git a/samples/powerpc-e300c3-linux-gnu/crosstool.config b/samples/powerpc-e300c3-linux-gnu/crosstool.config index b339e12..131abd0 100644 --- a/samples/powerpc-e300c3-linux-gnu/crosstool.config +++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_ARCH_CPU="e300c3" CT_TARGET_VENDOR="e300c3" diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config index b85928e..ef76f7d 100644 --- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config +++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_ARCH_CPU="8548" CT_ARCH_powerpc_ABI_SPE=y diff --git a/samples/powerpc-unknown-linux-gnu/crosstool.config b/samples/powerpc-unknown-linux-gnu/crosstool.config index 67b36a9..a515447 100644 --- a/samples/powerpc-unknown-linux-gnu/crosstool.config +++ b/samples/powerpc-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_KERNEL_LINUX=y CT_BINUTILS_PLUGINS=y diff --git a/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config index 9c209fd..40736a5 100644 --- a/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config +++ b/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_M68K=y CT_CANADIAN=y CT_HOST="powerpc-unknown-linux-uclibc" diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config index 0950dcd..a463464 100644 --- a/samples/powerpc-unknown-linux-uclibc/crosstool.config +++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config @@ -1,9 +1,9 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_ARCH_FLOAT_SW=y CT_KERNEL_LINUX=y CT_BINUTILS_FOR_TARGET=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_LANG_CXX=y CT_CC_LANG_FORTRAN=y CT_DEBUG_DUMA=y diff --git a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config index b2983ba..7c0d50b 100644 --- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config +++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_ARCH_FLOAT_SW=y CT_TARGET_VENDOR="unknown_nofpu" diff --git a/samples/powerpc64-multilib-linux-gnu/crosstool.config b/samples/powerpc64-multilib-linux-gnu/crosstool.config index 05b9787..2e81f9a 100644 --- a/samples/powerpc64-multilib-linux-gnu/crosstool.config +++ b/samples/powerpc64-multilib-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_MULTILIB=y CT_ARCH_64=y diff --git a/samples/powerpc64-unknown-linux-gnu/crosstool.config b/samples/powerpc64-unknown-linux-gnu/crosstool.config index 0469628..9dd482c 100644 --- a/samples/powerpc64-unknown-linux-gnu/crosstool.config +++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_ARCH_64=y CT_KERNEL_LINUX=y diff --git a/samples/powerpc64le-unknown-linux-gnu/crosstool.config b/samples/powerpc64le-unknown-linux-gnu/crosstool.config index 95d8025..11229d3 100644 --- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config +++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_ARCH_LE=y CT_ARCH_64=y diff --git a/samples/pru/crosstool.config b/samples/pru/crosstool.config index 2036c30..23d24f4 100644 --- a/samples/pru/crosstool.config +++ b/samples/pru/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_PRU=y CT_OMIT_TARGET_VENDOR=y # CT_DEMULTILIB is not set diff --git a/samples/riscv32-hifive1-elf/crosstool.config b/samples/riscv32-hifive1-elf/crosstool.config index 49c9340..994cb33 100644 --- a/samples/riscv32-hifive1-elf/crosstool.config +++ b/samples/riscv32-hifive1-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_RISCV=y CT_ARCH_ARCH="rv32ima" diff --git a/samples/riscv32-unknown-elf/crosstool.config b/samples/riscv32-unknown-elf/crosstool.config index 1d68b8f..96d665b 100644 --- a/samples/riscv32-unknown-elf/crosstool.config +++ b/samples/riscv32-unknown-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_RISCV=y CT_TARGET_VENDOR="" diff --git a/samples/riscv64-unknown-elf/crosstool.config b/samples/riscv64-unknown-elf/crosstool.config index 87e9b71..4ee0357 100644 --- a/samples/riscv64-unknown-elf/crosstool.config +++ b/samples/riscv64-unknown-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_RISCV=y # CT_DEMULTILIB is not set diff --git a/samples/riscv64-unknown-linux-gnu/crosstool.config b/samples/riscv64-unknown-linux-gnu/crosstool.config index c12993c..e145719 100644 --- a/samples/riscv64-unknown-linux-gnu/crosstool.config +++ b/samples/riscv64-unknown-linux-gnu/crosstool.config @@ -1,13 +1,12 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_RISCV=y # CT_DEMULTILIB is not set CT_ARCH_USE_MMU=y CT_ARCH_64=y CT_ARCH_ARCH="rv64gc" -CT_CC_LANG_CXX=y CT_KERNEL_LINUX=y +CT_CC_LANG_CXX=y CT_DEBUG_GDB=y # CT_GDB_CROSS_PYTHON is not set # CT_GDB_GDBSERVER is not set -CT_ZLIB_NEEDED=y diff --git a/samples/s390-ibm-linux-gnu/crosstool.config b/samples/s390-ibm-linux-gnu/crosstool.config index 06fb9f6..00c111a 100644 --- a/samples/s390-ibm-linux-gnu/crosstool.config +++ b/samples/s390-ibm-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_S390=y CT_TARGET_VENDOR="ibm" diff --git a/samples/s390-unknown-linux-gnu/crosstool.config b/samples/s390-unknown-linux-gnu/crosstool.config index bf6fbe0..ccf2334 100644 --- a/samples/s390-unknown-linux-gnu/crosstool.config +++ b/samples/s390-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_S390=y CT_KERNEL_LINUX=y diff --git a/samples/s390x-ibm-linux-gnu/crosstool.config b/samples/s390x-ibm-linux-gnu/crosstool.config index 8b4bb08..788bd1f 100644 --- a/samples/s390x-ibm-linux-gnu/crosstool.config +++ b/samples/s390x-ibm-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_S390=y CT_ARCH_64=y CT_TARGET_VENDOR="ibm" diff --git a/samples/s390x-unknown-linux-gnu/crosstool.config b/samples/s390x-unknown-linux-gnu/crosstool.config index 55b1622..3298991 100644 --- a/samples/s390x-unknown-linux-gnu/crosstool.config +++ b/samples/s390x-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_S390=y CT_ARCH_64=y CT_KERNEL_LINUX=y diff --git a/samples/sh-multilib-linux-gnu/crosstool.config b/samples/sh-multilib-linux-gnu/crosstool.config index 78e0ce4..0337ffd 100644 --- a/samples/sh-multilib-linux-gnu/crosstool.config +++ b/samples/sh-multilib-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_SH=y CT_ARCH_CPU="sh4" CT_ARCH_LE_BE=y diff --git a/samples/sh-multilib-linux-uclibc/crosstool.config b/samples/sh-multilib-linux-uclibc/crosstool.config index c4514f6..df09c37 100644 --- a/samples/sh-multilib-linux-uclibc/crosstool.config +++ b/samples/sh-multilib-linux-uclibc/crosstool.config @@ -1,11 +1,11 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_SH=y CT_ARCH_CPU="sh4" CT_ARCH_LE_BE=y CT_TARGET_VENDOR="multilib" CT_KERNEL_LINUX=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_GCC_MULTILIB_LIST="sh3,sh4,sh4a,sh4a-nofpu" CT_CC_LANG_CXX=y CT_DEBUG_GDB=y diff --git a/samples/sh-unknown-elf/crosstool.config b/samples/sh-unknown-elf/crosstool.config index cf06c37..00213dd 100644 --- a/samples/sh-unknown-elf/crosstool.config +++ b/samples/sh-unknown-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_SH=y CT_ARCH_LE_BE=y CT_BINUTILS_PLUGINS=y diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config index 88bb7a7..411ea7f 100644 --- a/samples/sparc-leon-linux-uclibc/crosstool.config +++ b/samples/sparc-leon-linux-uclibc/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_SPARC=y CT_ARCH_CPU="leon" CT_ARCH_TUNE="leon" @@ -6,7 +6,7 @@ CT_ARCH_FLOAT_SW=y CT_TARGET_VENDOR="leon" CT_KERNEL_LINUX=y CT_LINUX_V_3_10=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}.config" CT_LIBC_UCLIBC_IPV6=y CT_GCC_V_6=y diff --git a/samples/sparc-unknown-linux-gnu/crosstool.config b/samples/sparc-unknown-linux-gnu/crosstool.config index ee5191c..93ac922 100644 --- a/samples/sparc-unknown-linux-gnu/crosstool.config +++ b/samples/sparc-unknown-linux-gnu/crosstool.config @@ -1,3 +1,3 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_SPARC=y CT_KERNEL_LINUX=y diff --git a/samples/sparc64-multilib-linux-gnu/crosstool.config b/samples/sparc64-multilib-linux-gnu/crosstool.config index ea23563..d758f01 100644 --- a/samples/sparc64-multilib-linux-gnu/crosstool.config +++ b/samples/sparc64-multilib-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_SPARC=y CT_MULTILIB=y CT_ARCH_64=y diff --git a/samples/x86_64-centos7-linux-gnu/crosstool.config b/samples/x86_64-centos7-linux-gnu/crosstool.config index 0831970..cfe8fa4 100644 --- a/samples/x86_64-centos7-linux-gnu/crosstool.config +++ b/samples/x86_64-centos7-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_X86=y CT_ARCH_64=y diff --git a/samples/x86_64-multilib-linux-gnu/crosstool.config b/samples/x86_64-multilib-linux-gnu/crosstool.config index b581456..b19920d 100644 --- a/samples/x86_64-multilib-linux-gnu/crosstool.config +++ b/samples/x86_64-multilib-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_X86=y CT_MULTILIB=y CT_ARCH_64=y diff --git a/samples/x86_64-multilib-linux-musl/crosstool.config b/samples/x86_64-multilib-linux-musl/crosstool.config index 83edf11..0fe7cda 100644 --- a/samples/x86_64-multilib-linux-musl/crosstool.config +++ b/samples/x86_64-multilib-linux-musl/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_X86=y CT_MULTILIB=y diff --git a/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config b/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config index 5fd79e4..ed795f3 100644 --- a/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config +++ b/samples/x86_64-multilib-linux-uclibc,moxie-unknown-moxiebox/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_MOXIE=y CT_CANADIAN=y @@ -7,4 +7,3 @@ CT_DEBUG_GDB=y CT_GDB_CROSS_SIM=y # CT_LIBICONV_NEEDED is not set # CT_GETTEXT_NEEDED is not set -CT_DTC_VERBOSE=y diff --git a/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config b/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config index 07c0155..ee02ef7 100644 --- a/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config +++ b/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_POWERPC=y CT_TARGET_VENDOR="" CT_CANADIAN=y diff --git a/samples/x86_64-multilib-linux-uclibc/crosstool.config b/samples/x86_64-multilib-linux-uclibc/crosstool.config index 0136376..50c5d3b 100644 --- a/samples/x86_64-multilib-linux-uclibc/crosstool.config +++ b/samples/x86_64-multilib-linux-uclibc/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_X86=y CT_MULTILIB=y CT_ARCH_64=y @@ -9,7 +9,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_LANG_CXX=y CT_DEBUG_DUMA=y CT_DEBUG_GDB=y diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config deleted file mode 100644 index 45d80bc..0000000 --- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config +++ /dev/null @@ -1,10 +0,0 @@ -CT_CONFIG_VERSION="3" -CT_OBSOLETE=y -CT_ARCH_X86=y -CT_ARCH_64=y -CT_TARGET_VENDOR="ubuntu12.04" -CT_KERNEL_LINUX=y -CT_LINUX_V_3_2=y -# CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_GLIBC_V_2_15=y -CT_CC_LANG_CXX=y diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/reported.by b/samples/x86_64-ubuntu12.04-linux-gnu/reported.by deleted file mode 100644 index d060e03..0000000 --- a/samples/x86_64-ubuntu12.04-linux-gnu/reported.by +++ /dev/null @@ -1,3 +0,0 @@ -reporter_name="Alexey Neyman" -reporter_url="" -reporter_comment="x86_64 kernel/libc matching Ubuntu 12.04 LTS." diff --git a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config index 535df2b..15380f0 100644 --- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config +++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_X86=y CT_ARCH_64=y diff --git a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config index 4948c00..b30e6d1 100644 --- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config +++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_OBSOLETE=y CT_ARCH_X86=y CT_ARCH_64=y diff --git a/samples/x86_64-unknown-linux-gnu/crosstool.config b/samples/x86_64-unknown-linux-gnu/crosstool.config index 27637ed..ec8f38f 100644 --- a/samples/x86_64-unknown-linux-gnu/crosstool.config +++ b/samples/x86_64-unknown-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_X86=y CT_ARCH_64=y CT_KERNEL_LINUX=y diff --git a/samples/x86_64-unknown-linux-uclibc/crosstool.config b/samples/x86_64-unknown-linux-uclibc/crosstool.config index 9b1687e..9edc8d3 100644 --- a/samples/x86_64-unknown-linux-uclibc/crosstool.config +++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_X86=y CT_ARCH_64=y CT_KERNEL_LINUX=y @@ -7,7 +7,7 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_LANG_CXX=y CT_DEBUG_DUMA=y CT_DEBUG_GDB=y diff --git a/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config index 638c6c1..b93a99b 100644 --- a/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config +++ b/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_ARM=y CT_ARCH_CPU="cortex-a9" diff --git a/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config b/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config index 64cfbcd..cf53af7 100644 --- a/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config +++ b/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y # CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES is not set CT_ARCH_X86=y diff --git a/samples/x86_64-w64-mingw32/crosstool.config b/samples/x86_64-w64-mingw32/crosstool.config index 40cbe12..470be44 100644 --- a/samples/x86_64-w64-mingw32/crosstool.config +++ b/samples/x86_64-w64-mingw32/crosstool.config @@ -1,4 +1,4 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_EXPERIMENTAL=y CT_ARCH_X86=y CT_MULTILIB=y diff --git a/samples/xtensa-fsf-elf/crosstool.config b/samples/xtensa-fsf-elf/crosstool.config index 1caffd1..2ddf9a0 100644 --- a/samples/xtensa-fsf-elf/crosstool.config +++ b/samples/xtensa-fsf-elf/crosstool.config @@ -1,4 +1,5 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" +CT_OBSOLETE=y CT_EXPERIMENTAL=y CT_ALLOW_BUILD_AS_ROOT=y CT_ALLOW_BUILD_AS_ROOT_SURE=y diff --git a/samples/xtensa-fsf-linux-uclibc/crosstool.config b/samples/xtensa-fsf-linux-uclibc/crosstool.config index 3c524b0..0e821cb 100644 --- a/samples/xtensa-fsf-linux-uclibc/crosstool.config +++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config @@ -1,9 +1,9 @@ -CT_CONFIG_VERSION="3" +CT_CONFIG_VERSION="4" CT_ARCH_XTENSA=y CT_ARCH_BE=y CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals" CT_TARGET_VENDOR="fsf" CT_KERNEL_LINUX=y -CT_LIBC_UCLIBC=y +CT_LIBC_UCLIBC_NG=y CT_CC_LANG_CXX=y CT_DEBUG_GDB=y -- cgit v0.10.2-6-g49f6 From b4191b23a8411e508796fe6c110fdc3b05d94e69 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 2 Feb 2022 14:26:22 -0800 Subject: Update tic6x sample Restrict kernel to 5.11 and below (support for this arch has been dropped in 5.12); rename the sample to match its name as printed by `ct-ng show-tuple` (otherwise, `make saveconfig` does not update the sample's configuration). Signed-off-by: Alexey Neyman diff --git a/config/arch/c6x.in b/config/arch/c6x.in index 93a8993..98589cc 100644 --- a/config/arch/c6x.in +++ b/config/arch/c6x.in @@ -7,9 +7,12 @@ ## select ARCH_DEFAULT_LE ## select ARCH_SUPPORTS_FLAT_FORMAT ## select ARCH_SUPPORTS_WITH_CPU +## select LINUX_REQUIRE_older_than_5_12 +## select LINUX_REQUIRE_3_7_or_later ## depends on EXPERIMENTAL ## ## help The TI C6x (TMS320C6000) architecture ## help https://www.ti.com/processors/digital-signal-processors -## help For linux, kernel must be 3.7 or later (or custom) +## help For linux, kernel must be 3.7 or later (or custom) but not newer +## help than 5.11.x (support for C6x was removed in 5.12). diff --git a/packages/linux/package.desc b/packages/linux/package.desc index f5fa080..2896725 100644 --- a/packages/linux/package.desc +++ b/packages/linux/package.desc @@ -2,6 +2,6 @@ origin='www.kernel.org' repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' mirrors='$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})' relevantpattern='2.*.*|. *.*|.' -milestones='3.2 3.7 4.8 5.3' +milestones='3.2 3.7 4.8 5.3 5.12' archive_formats='.tar.xz .tar.gz' signature_format='unpacked/.sign' diff --git a/samples/tic6x-uclinux-uclibc/crosstool.config b/samples/tic6x-uclinux-uclibc/crosstool.config deleted file mode 100644 index cd4af2c..0000000 --- a/samples/tic6x-uclinux-uclibc/crosstool.config +++ /dev/null @@ -1,14 +0,0 @@ -CT_CONFIG_VERSION="3" -CT_EXPERIMENTAL=y -CT_ARCH_C6X=y -CT_OMIT_TARGET_VENDOR=y -CT_KERNEL_LINUX=y -CT_MULTILIB=y -CT_LIBC_UCLIBC=y -CT_THREADS="linuxthreads" -CT_UCLIBC_NG_DEVEL_VCS_git=y -CT_UCLIBC_NG_DEVEL_URL="https://github.com/DspHack/uclibc-ng.git" -CT_ARCH_BINFMT_FDPIC=y -CT_CC_LANG_CXX=y -CT_ARCH_ENDIAN="little" - diff --git a/samples/tic6x-uclinux-uclibc/reported.by b/samples/tic6x-uclinux-uclibc/reported.by deleted file mode 100644 index e51f694..0000000 --- a/samples/tic6x-uclinux-uclibc/reported.by +++ /dev/null @@ -1,3 +0,0 @@ -reporter_name="Dan Tejada " -reporter_url="https://www.cantada.com/" -reporter_comment="Tested with uclibc and linux kernel from http://linux-c6x.org" diff --git a/samples/tic6x-uclinux/crosstool.config b/samples/tic6x-uclinux/crosstool.config new file mode 100644 index 0000000..614c39a --- /dev/null +++ b/samples/tic6x-uclinux/crosstool.config @@ -0,0 +1,12 @@ +CT_CONFIG_VERSION="4" +CT_EXPERIMENTAL=y +CT_ARCH_C6X=y +CT_OMIT_TARGET_VENDOR=y +CT_MULTILIB=y +CT_KERNEL_LINUX=y +CT_ARCH_BINFMT_FDPIC=y +CT_LIBC_UCLIBC_NG=y +CT_UCLIBC_NG_SRC_DEVEL=y +CT_UCLIBC_NG_DEVEL_URL="https://github.com/DspHack/uclibc-ng.git" +CT_THREADS_LT=y +CT_CC_LANG_CXX=y diff --git a/samples/tic6x-uclinux/reported.by b/samples/tic6x-uclinux/reported.by new file mode 100644 index 0000000..e51f694 --- /dev/null +++ b/samples/tic6x-uclinux/reported.by @@ -0,0 +1,3 @@ +reporter_name="Dan Tejada " +reporter_url="https://www.cantada.com/" +reporter_comment="Tested with uclibc and linux kernel from http://linux-c6x.org" -- cgit v0.10.2-6-g49f6 From c48319e65f588179a640bc5b998b6c7ecec487f6 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 2 Feb 2022 17:38:53 -0800 Subject: Rename moxiebox to match its tuple Signed-off-by: Alexey Neyman diff --git a/samples/moxie-unknown-moxiebox/crosstool.config b/samples/moxie-unknown-moxiebox/crosstool.config new file mode 100644 index 0000000..fe08882 --- /dev/null +++ b/samples/moxie-unknown-moxiebox/crosstool.config @@ -0,0 +1,7 @@ +CT_CONFIG_VERSION="4" +CT_EXPERIMENTAL=y +CT_ARCH_MOXIE=y +CT_ARCH_LE=y +CT_DEBUG_GDB=y +CT_GDB_CROSS_SIM=y +# CT_GDB_CROSS_PYTHON is not set diff --git a/samples/moxie-unknown-moxiebox/reported.by b/samples/moxie-unknown-moxiebox/reported.by new file mode 100644 index 0000000..b9de4f7 --- /dev/null +++ b/samples/moxie-unknown-moxiebox/reported.by @@ -0,0 +1,3 @@ +reporter_name="Alexey Neyman" +reporter_url="" +reporter_comment="Moxie toolchain with moxiebox+newlib as the C library." diff --git a/samples/moxiebox/crosstool.config b/samples/moxiebox/crosstool.config deleted file mode 100644 index fe08882..0000000 --- a/samples/moxiebox/crosstool.config +++ /dev/null @@ -1,7 +0,0 @@ -CT_CONFIG_VERSION="4" -CT_EXPERIMENTAL=y -CT_ARCH_MOXIE=y -CT_ARCH_LE=y -CT_DEBUG_GDB=y -CT_GDB_CROSS_SIM=y -# CT_GDB_CROSS_PYTHON is not set diff --git a/samples/moxiebox/reported.by b/samples/moxiebox/reported.by deleted file mode 100644 index b9de4f7..0000000 --- a/samples/moxiebox/reported.by +++ /dev/null @@ -1,3 +0,0 @@ -reporter_name="Alexey Neyman" -reporter_url="" -reporter_comment="Moxie toolchain with moxiebox+newlib as the C library." -- cgit v0.10.2-6-g49f6 From 586c2d01565fca083837e09f217d61e8d7ca7ae2 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 4 Feb 2022 10:31:25 -0800 Subject: sparc-leon: restrict to GDB9 Starting with GDB10, it requires support for std::future<> in the compiler. Such support has not been available on some architectures until GCC9 (see PR 64735). I haven't determined the exact list of affected architectures, so decided to make it a broad dependency: for GDB10+, you need GCC9+. Signed-off-by: Alexey Neyman diff --git a/config/debug/gdb.in b/config/debug/gdb.in index aa3235e..b0b9d29 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -21,6 +21,13 @@ config GDB_DEP_CXX11 depends on !CONFIGURE_has_cxx11 select GDB_REQUIRE_older_than_8_0 +# GDB10 and newer require std::future<> which was not implemented on some +# architectures until GCC9; see GCC PR 64735. +config GDB_DEP_NO_STD_FUTURE + def_bool y + depends on !GCC_9_or_later + select GDB_REQUIRE_older_than_10_2 + # Does GDB need ps_get_thread_area with const qualifier? config GDB_CONST_GET_THREAD_AREA bool diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config index 411ea7f..0fd6360 100644 --- a/samples/sparc-leon-linux-uclibc/crosstool.config +++ b/samples/sparc-leon-linux-uclibc/crosstool.config @@ -8,7 +8,6 @@ CT_KERNEL_LINUX=y CT_LINUX_V_3_10=y CT_LIBC_UCLIBC_NG=y CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}.config" -CT_LIBC_UCLIBC_IPV6=y CT_GCC_V_6=y CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm" CT_CC_LANG_CXX=y -- cgit v0.10.2-6-g49f6 From 4c0d78bb64797bee5414bbc92b35dbbb3e57b34f Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 4 Feb 2022 11:35:52 -0800 Subject: gdb: use single-number versions/milestones for 9+ Starting with GDB9, the release number is only two numbers (with the last being patchlevel). Therefore, keep two numbers for releases 8 and below, but just a single number for 9 and up. Signed-off-by: Alexey Neyman diff --git a/config/debug/gdb.in b/config/debug/gdb.in index b0b9d29..741eeae 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -26,7 +26,7 @@ config GDB_DEP_CXX11 config GDB_DEP_NO_STD_FUTURE def_bool y depends on !GCC_9_or_later - select GDB_REQUIRE_older_than_10_2 + select GDB_REQUIRE_older_than_10 # Does GDB need ps_get_thread_area with const qualifier? config GDB_CONST_GET_THREAD_AREA @@ -37,4 +37,4 @@ config GDB_CONST_GET_THREAD_AREA # tarball (instead of a subdirectory of gdb) config GDB_GDBSERVER_TOPLEVEL def_bool y - depends on GDB_10_2_or_later + depends on GDB_10_or_later diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native index b4721c8..fc79084 100644 --- a/config/debug/gdb.in.native +++ b/config/debug/gdb.in.native @@ -10,7 +10,7 @@ config GDB_NATIVE select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC_NG && GDB_8_3_or_later select EXPAT_TARGET select NCURSES_TARGET - select GMP_TARGET if GDB_11_1_or_later + select GMP_TARGET if GDB_11_or_later help Build and install a native gdb for the target, to run on the target. diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc index 06efd37..bdd806a 100644 --- a/packages/gdb/package.desc +++ b/packages/gdb/package.desc @@ -1,6 +1,6 @@ origin='GNU' repository='git git://sourceware.org/git/binutils-gdb.git' mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)' -relevantpattern='*.*|[a-z.]' -milestones='7.11 7.12 8.0 8.3 10.2 11.1' +relevantpattern='[78].*|. *|.' +milestones='7.11 7.12 8.0 8.3 10 11' archive_formats='.tar.xz .tar.gz' -- cgit v0.10.2-6-g49f6 From db3b51de5adafe23d9e627b795d4d0d8d820222a Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Fri, 4 Feb 2022 12:33:45 -0800 Subject: Remove GDB 11.1 This was originally an upgrade from 11.1 to 11.2 that fixed moxie-* samples affected by PR sim/28302. GDB 11.2 landed independently on master, so just remove 11.1 (one release per upstream branch, please, we already have lots of version/architecture/host permutations to test). Signed-off-by: Alexey Neyman diff --git a/packages/gdb/11.1/0000-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/11.1/0000-xtensa-make-sure-ar_base-is-initialized.patch deleted file mode 100644 index d608922..0000000 --- a/packages/gdb/11.1/0000-xtensa-make-sure-ar_base-is-initialized.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 208ea73d38c9c16cf983b6419f58050dbadcb6a9 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 7 Jun 2015 22:43:49 +0300 -Subject: [PATCH 2/2] xtensa: make sure ar_base is initialized - -ar_base is uninitialized for cores w/o windowed registers as their -regmap doesn't have register 0x0100. -Check that ar_base is initialized and if not initialize it with a0_base. - -gdb/ - * xtensa-tdep.c (xtensa_derive_tdep): Make sure ar_base is - initialized. - -Signed-off-by: Max Filippov ---- - gdb/xtensa-tdep.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/gdb/xtensa-tdep.c -+++ b/gdb/xtensa-tdep.c -@@ -3129,6 +3129,9 @@ - if (tdep->num_regs == 0) - tdep->num_regs = tdep->num_nopriv_regs; - -+ if (tdep->ar_base == -1) -+ tdep->ar_base = tdep->a0_base; -+ - /* Number of pseudo registers. */ - tdep->num_pseudo_regs = n - tdep->num_regs; - diff --git a/packages/gdb/11.1/0001-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/11.1/0001-WIP-end-of-prologue-detection-hack.patch deleted file mode 100644 index 5eec5d6..0000000 --- a/packages/gdb/11.1/0001-WIP-end-of-prologue-detection-hack.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7f8eacbb468575fb67db7fd1155a3aedaa91911b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 7 Jun 2015 23:15:39 +0300 -Subject: [PATCH] WIP: *end of prologue* detection hack - -see - http://www.esp8266.com/viewtopic.php?p=18461#p18461 - http://www.esp8266.com/viewtopic.php?p=19026#p19026 - http://www.esp8266.com/viewtopic.php?p=19683#p19683 - -Signed-off-by: Max Filippov ---- - gdb/xtensa-tdep.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/gdb/xtensa-tdep.c -+++ b/gdb/xtensa-tdep.c -@@ -2377,7 +2377,7 @@ - /* Find out, if we have an information about the prologue from DWARF. */ - prologue_sal = find_pc_line (start, 0); - if (prologue_sal.line != 0) /* Found debug info. */ -- body_pc = prologue_sal.end; -+ body_pc = prologue_sal.end + 40; - - /* If we are going to analyze the prologue in general without knowing about - the current PC, make the best assumption for the end of the prologue. */ diff --git a/packages/gdb/11.1/0002-allow-android.patch b/packages/gdb/11.1/0002-allow-android.patch deleted file mode 100644 index d6c5869..0000000 --- a/packages/gdb/11.1/0002-allow-android.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- - gdbserver/configure | 11 ----------- - gdbserver/configure.ac | 11 ----------- - 2 files changed, 22 deletions(-) - ---- a/gdbserver/configure -+++ b/gdbserver/configure -@@ -10028,17 +10028,6 @@ - - - case "${target}" in -- *-android*) -- # Starting with NDK version 9, actually includes definitions -- # of Elf32_auxv_t and Elf64_auxv_t. But sadly, includes -- # which defines some of the ELF types incorrectly, -- # leading to conflicts with the defintions from . -- # This makes it impossible for us to include both and -- # , which means that, in practice, we do not have -- # access to Elf32_auxv_t and Elf64_auxv_t on this platform. -- # Therefore, do not try to auto-detect availability, as it would -- # get it wrong on this platform. -- ;; - *) - ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include - ---- a/gdbserver/configure.ac -+++ b/gdbserver/configure.ac -@@ -171,17 +171,6 @@ - ]) - - case "${target}" in -- *-android*) -- # Starting with NDK version 9, actually includes definitions -- # of Elf32_auxv_t and Elf64_auxv_t. But sadly, includes -- # which defines some of the ELF types incorrectly, -- # leading to conflicts with the defintions from . -- # This makes it impossible for us to include both and -- # , which means that, in practice, we do not have -- # access to Elf32_auxv_t and Elf64_auxv_t on this platform. -- # Therefore, do not try to auto-detect availability, as it would -- # get it wrong on this platform. -- ;; - *) - AC_CHECK_TYPES([Elf32_auxv_t, Elf64_auxv_t], [], [], - #include diff --git a/packages/gdb/11.1/0003-xtensa-Fix-compilation-of-gdbserver.patch b/packages/gdb/11.1/0003-xtensa-Fix-compilation-of-gdbserver.patch deleted file mode 100644 index 7ccfa68..0000000 --- a/packages/gdb/11.1/0003-xtensa-Fix-compilation-of-gdbserver.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6f110500ed04148e3734f5b6a4fc573477c8398a Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Tue, 24 Aug 2021 12:29:18 -0700 -Subject: [PATCH] xtensa: Fix compilation of gdbserver - -Otherwise a lot of errors like the following happen: ---------------------------->8--------------------------------- -Error: .../gdb/xtensa-linux-nat.c:66:17: error: 'gdbarch_pc_regnum' was not declared in this scope -Error: .../gdb/xtensa-linux-nat.c:68:17: error: 'gdbarch_ps_regnum' was not declared in this scope -Error: .../gdb/xtensa-linux-nat.c:71:38: error: no matching function for call to 'gdbarch_tdep::gdbarch_tdep(gdbarch*&)' -... ---------------------------->8--------------------------------- - -Initially caught by https://github.com/crosstool-ng/crosstool-ng/pull/1573/checks?check_run_id=3361561567 - -Signed-off-by: Alexey Brodkin ---- - gdb/xtensa-linux-nat.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/gdb/xtensa-linux-nat.c -+++ b/gdb/xtensa-linux-nat.c -@@ -34,6 +34,7 @@ - #include "nat/gdb_ptrace.h" - #include - -+#include "gdbarch.h" - #include "gregset.h" - #include "xtensa-tdep.h" - diff --git a/packages/gdb/11.1/chksum b/packages/gdb/11.1/chksum deleted file mode 100644 index f81f46d..0000000 --- a/packages/gdb/11.1/chksum +++ /dev/null @@ -1,8 +0,0 @@ -md5 gdb-11.1.tar.xz 257cb0f67927f79acf636d8c01e19990 -sha1 gdb-11.1.tar.xz 6cb3361c7f2b22d6d2c25ab4992264aa41bc2471 -sha256 gdb-11.1.tar.xz cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94 -sha512 gdb-11.1.tar.xz c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46 -md5 gdb-11.1.tar.gz eb6596d83bdccea06caa6d49d923e119 -sha1 gdb-11.1.tar.gz 71cf191c4409790f9f0b74e039145fbf61fd9916 -sha256 gdb-11.1.tar.gz cc2903474e965a43d09c3b263952d48ced39dd22ce2d01968f3aa181335fcb9c -sha512 gdb-11.1.tar.gz 79420671b7f9ae70a474ff0122417edd8746b050b8079b667a799c72853a6fdfbf8f9bc820ebaae7776005eaf41eb6d2c7f17d88a286d8269f133c70d146aca7 diff --git a/packages/gdb/11.1/version.desc b/packages/gdb/11.1/version.desc deleted file mode 100644 index e69de29..0000000 -- cgit v0.10.2-6-g49f6 From 58da27c96589f502744a77b1288172ab75df052c Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 5 Feb 2022 13:26:29 -0800 Subject: Restrict bionic's GCC/GDB selections Refer to the comments in the code for the reason. Signed-off-by: Alexey Neyman diff --git a/config/libc/bionic.in b/config/libc/bionic.in index 558c2b4..a5b150e 100644 --- a/config/libc/bionic.in +++ b/config/libc/bionic.in @@ -1,11 +1,20 @@ # bionic options + ## package android-ndk ## depends on ! WINDOWS && ! BARE_METAL ## depends on ARCH_ARM || ARCH_MIPS || ARCH_X86 ## depends on EXPERIMENTAL +# +# Patches to support bionic were not ported to GCC11 (or to GCC5 and below). ## select GCC_REQUIRE_6_or_later -## +## select GCC_REQUIRE_older_than_11 +# +# GDB10 imported a new drop from gnulib, which fails to build against bionic. +# Patch to support bionic was ported to 7.12 and newer. +## select GDB_REQUIRE_7_12_or_later +## select GDB_REQUIRE_older_than_10 + ## select LIBC_SUPPORT_THREADS_POSIX ## ## help Bionic is the Android C library. It is prebuilt, extracted from the Android NDK. -- cgit v0.10.2-6-g49f6 From a59503c8722f25097d58a81838e57e9afcb66614 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 5 Feb 2022 16:47:46 -0800 Subject: Update m4 to 1.4.19 This fixes the x86_64-multilib-linux-uclibc,powerpc-unknown-elf canadian cross example (which currently breaks because the gnulib example assumes SIGSTKSZ is constant while recent libcs started defining it as a sysconf(...) call. Signed-off-by: Alexey Neyman diff --git a/packages/m4/1.4.18/0000-fix-glibc-2.28.patch b/packages/m4/1.4.18/0000-fix-glibc-2.28.patch deleted file mode 100644 index d47a709..0000000 --- a/packages/m4/1.4.18/0000-fix-glibc-2.28.patch +++ /dev/null @@ -1,144 +0,0 @@ -commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e -Author: Paul Eggert -Date: Mon Mar 5 10:56:29 2018 -0800 - - fflush: adjust to glibc 2.28 libio.h removal - - Problem reported by Daniel P. Berrangé in: - https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html - * lib/fbufmode.c (fbufmode): - * lib/fflush.c (clear_ungetc_buffer_preserving_position) - (disable_seek_optimization, rpl_fflush): - * lib/fpending.c (__fpending): - * lib/fpurge.c (fpurge): - * lib/freadable.c (freadable): - * lib/freadahead.c (freadahead): - * lib/freading.c (freading): - * lib/freadptr.c (freadptr): - * lib/freadseek.c (freadptrinc): - * lib/fseeko.c (fseeko): - * lib/fseterr.c (fseterr): - * lib/fwritable.c (fwritable): - * lib/fwriting.c (fwriting): - Check _IO_EOF_SEEN instead of _IO_ftrylockfile. - * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: - Define if not already defined. - ---- - lib/fflush.c | 6 +++--- - lib/fpending.c | 2 +- - lib/fpurge.c | 2 +- - lib/freadahead.c | 2 +- - lib/freading.c | 2 +- - lib/fseeko.c | 4 ++-- - lib/stdio-impl.h | 6 ++++++ - 7 files changed, 15 insertions(+), 9 deletions(-) - ---- a/lib/fflush.c -+++ b/lib/fflush.c -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ -@@ -148,7 +148,7 @@ - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - ---- a/lib/fpending.c -+++ b/lib/fpending.c -@@ -32,7 +32,7 @@ - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return fp->_IO_write_ptr - fp->_IO_write_base; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ ---- a/lib/fpurge.c -+++ b/lib/fpurge.c -@@ -62,7 +62,7 @@ - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ ---- a/lib/freadahead.c -+++ b/lib/freadahead.c -@@ -25,7 +25,7 @@ - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) ---- a/lib/freading.c -+++ b/lib/freading.c -@@ -31,7 +31,7 @@ - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); ---- a/lib/fseeko.c -+++ b/lib/fseeko.c -@@ -47,7 +47,7 @@ - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ ---- a/lib/stdio-impl.h -+++ b/lib/stdio-impl.h -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - diff --git a/packages/m4/1.4.18/chksum b/packages/m4/1.4.18/chksum deleted file mode 100644 index cea7472..0000000 --- a/packages/m4/1.4.18/chksum +++ /dev/null @@ -1,12 +0,0 @@ -md5 m4-1.4.18.tar.xz 730bb15d96fffe47e148d1e09235af82 -sha1 m4-1.4.18.tar.xz 228604686ca23f42e48b98930babeb5d217f1899 -sha256 m4-1.4.18.tar.xz f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 -sha512 m4-1.4.18.tar.xz 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174 -md5 m4-1.4.18.tar.bz2 199fff9c87f1c920dab5c8757811e146 -sha1 m4-1.4.18.tar.bz2 63224a10becb5f527542b2e7baf2a1572666dbed -sha256 m4-1.4.18.tar.bz2 6640d76b043bc658139c8903e293d5978309bf0f408107146505eca701e67cf6 -sha512 m4-1.4.18.tar.bz2 45dcf67df017ccd5482c9f96f83c7fd2d16b176bffa4c6cdc11a8810b8b624ab0bbb976c8ab5c97bac8092ef9de21d5934df4303cc0e4a5328fd8ab4231dabd0 -md5 m4-1.4.18.tar.gz a077779db287adf4e12a035029002d28 -sha1 m4-1.4.18.tar.gz 2f76f8105a45b05c8cfede97b3193cd88b31c657 -sha256 m4-1.4.18.tar.gz ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab -sha512 m4-1.4.18.tar.gz 29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae diff --git a/packages/m4/1.4.18/version.desc b/packages/m4/1.4.18/version.desc deleted file mode 100644 index e69de29..0000000 diff --git a/packages/m4/1.4.19/chksum b/packages/m4/1.4.19/chksum new file mode 100644 index 0000000..093966e --- /dev/null +++ b/packages/m4/1.4.19/chksum @@ -0,0 +1,12 @@ +md5 m4-1.4.19.tar.xz 0d90823e1426f1da2fd872df0311298d +sha1 m4-1.4.19.tar.xz b44b5c9746b69ee19204b7cb76d3a7b3eac69259 +sha256 m4-1.4.19.tar.xz 63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 +sha512 m4-1.4.19.tar.xz 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b +md5 m4-1.4.19.tar.bz2 a8ff6fc3235eab3a4adb53611fdddacd +sha1 m4-1.4.19.tar.bz2 7dd5aab713b50108bfbce47aea4968d630bf9511 +sha256 m4-1.4.19.tar.bz2 b306a91c0fd93bc4280cfc2e98cb7ab3981ff75a187bea3293811f452c89a8c8 +sha512 m4-1.4.19.tar.bz2 91c85925b83dd735dad34860756ab636f88e276d39827e81ec13f33b0b36cd42c9729c53faf4e1db101e32eecebec933799fc64cb16d138e68dbba7710d4bd19 +md5 m4-1.4.19.tar.gz f4a2b0284d80353b995f8ef2385ed73c +sha1 m4-1.4.19.tar.gz 1b9141800f481353b8bcfafe8ec03d3d95f03f64 +sha256 m4-1.4.19.tar.gz 3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70 +sha512 m4-1.4.19.tar.gz f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2 diff --git a/packages/m4/1.4.19/version.desc b/packages/m4/1.4.19/version.desc new file mode 100644 index 0000000..e69de29 -- cgit v0.10.2-6-g49f6 From c6ff1eca5b2d41bbfd085413fad4652524b726a8 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 6 Feb 2022 15:12:59 -0800 Subject: Restrict *-uclibc,* canadians to gettext 0.20 Newer gettext is incompatible with uClibc-NG in cross-compilation, see the comment in the code. Signed-off-by: Alexey Neyman diff --git a/config/comp_libs/gettext.in b/config/comp_libs/gettext.in index df7e336..85e4387 100644 --- a/config/comp_libs/gettext.in +++ b/config/comp_libs/gettext.in @@ -1 +1,11 @@ # gettext options + +config GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG + def_bool y + depends on GETTEXT_0_21_or_later + +if GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG +comment "This version of gettext is not compatible with uClibc-NG. Select" +comment "a different version if uClibc-NG is used on the target or (in a" +comment "Canadian cross build) on the host." +endif diff --git a/packages/gettext/package.desc b/packages/gettext/package.desc index 99d493f..2341b4b 100644 --- a/packages/gettext/package.desc +++ b/packages/gettext/package.desc @@ -5,3 +5,4 @@ bootstrap='./autogen.sh' mirrors='$(CT_Mirrors GNU gettext)' archive_formats='.tar.xz .tar.gz' signature_format='packed/.sig' +milestones='0.21' diff --git a/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config index 40736a5..29e7406 100644 --- a/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config +++ b/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config @@ -4,3 +4,4 @@ CT_CANADIAN=y CT_HOST="powerpc-unknown-linux-uclibc" CT_KERNEL_LINUX=y CT_THREADS_LT=y +CT_GETTEXT_V_0_20_1=y diff --git a/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config b/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config index ee02ef7..867ac13 100644 --- a/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config +++ b/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config @@ -6,6 +6,7 @@ CT_HOST="x86_64-multilib-linux-uclibc" CT_BINUTILS_PLUGINS=y CT_CC_LANG_CXX=y CT_DEBUG_GDB=y +CT_GETTEXT_V_0_20_1=y CT_COMP_TOOLS_FOR_HOST=y CT_COMP_TOOLS_M4=y CT_COMP_TOOLS_MAKE=y diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh index 149d7d7..9fa3bdc 100644 --- a/scripts/build/companion_libs/330-gettext.sh +++ b/scripts/build/companion_libs/330-gettext.sh @@ -80,6 +80,28 @@ do_gettext_backend() { return ;; + # Starting with 0.21, gettext cannot build against uClibc-NG: gettext + # checks if it needs to use fopen wrapper (using gnulib) and newer versions + # of gnulib also check if fopen provided by the system supports 'e' and 'x' + # modes. In cross-compile environment, gnulib falls back to assuming fopen + # does not support these modes unless the target tuple is glibc or musl + # (rightly so, since these fopen modes are optional in uClibc-NG). + # Unfortunately, the fopen() wrapper does not compile against uClibc-NG's + # stdio.h then because it includes after defining __need_FILE macro. + # It looks like two bugs, one in each of uClibc-ng and gnulib: + # - uClibc-ng does not include its internal headers with the definitions for the + # __BEGIN_NAMESPACE_STD/__END_NAMESPACE_STD macros, which therefore escape + # unsubstituted into the including code. + # - gnulib shouldn't expect the fopen() prototype if it only asked for FILE + # structure definition by defining the __need_FILE macro. + # Until the maintainers sort this out, disallow newer gettext versions if + # linking against uClibc-NG. + *-uclibc*) + if [ "${CT_GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG}" = "y" ]; then + CT_Abort "This version of gettext is incompatible with uClibc-NG" + fi + ;; + # A bit ugly. D__USE_MINGW_ANSI_STDIO=1 has its own {v}asprintf functions # but gettext configure doesn't see this flag when it checks for that. An # alternative may be to use CC="${host}-gcc ${cflags}" but that didn't -- cgit v0.10.2-6-g49f6 From 7b97bdd825bd27dc433d69dfd2e50404947a2852 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 8 Feb 2022 17:11:32 -0800 Subject: Convert tabs to spaces Recent changes introduced a mixture of tabs/spaces that result in broken indentation in multiple places. Signed-off-by: Alexey Neyman diff --git a/config/comp_libs/picolibc.in b/config/comp_libs/picolibc.in index cb7a1e4..99f0e45 100644 --- a/config/comp_libs/picolibc.in +++ b/config/comp_libs/picolibc.in @@ -62,7 +62,7 @@ config LIBC_PICOLIBC_GLOBAL_ATEXIT prompt "Enable atexit data structure as global variable" help Enable atexit data structure as global variable, instead - of being thread-local. + of being thread-local. config LIBC_PICOLIBC_LITE_EXIT bool diff --git a/scripts/build/arch/sparc.sh b/scripts/build/arch/sparc.sh index 97c9b9d..22d98e4 100644 --- a/scripts/build/arch/sparc.sh +++ b/scripts/build/arch/sparc.sh @@ -4,31 +4,31 @@ CT_DoArchTupleValues() { CT_TARGET_ARCH="sparc${target_bits_64}${CT_ARCH_SUFFIX}" if [ "${CT_KERNEL}" = "linux" -a -z "${CT_ARCH_CPU}" ]; then - if [ "${CT_ARCH_64}" = "y" ]; then - # By default, sparc64-*-linux is configured with -mcpu=v9. However, - # according to https://sourceware.org/ml/libc-alpha/2005-12/msg00027.html, - # "There is no Linux sparc64 port that runs on non-UltraSPARC-I+ ISA CPUs." - # There is a patch that would change the default to -mcpu=ultrasparc for - # sparc64-*-linux configuration: https://patchwork.ozlabs.org/patch/409424/ - # but that patch has not been integrated (yet). One concern raised about - # this patch was that -mcpu=ultrasparc can suboptimally schedule instructions - # for newer SPARC CPUs. So, override to -mcpu=ultrasparc and warn the user. - CT_DoLog WARN "Setting CPU to UltraSPARC-I for sparc64-linux. Set CT_ARCH_CPU if a different CPU is desired." - CT_ARCH_WITH_CPU="--with-cpu=ultrasparc" - if [ -n "${CT_ARCH_SUPPORTS_WITH_32_64}" -a -n "${CT_MULTILIB}" ]; then - CT_ARCH_WITH_CPU_32="--with-cpu-32=ultrasparc" - CT_ARCH_WITH_CPU_64="--with-cpu-64=ultrasparc" - fi - else - # Similarly, sparc-*-linux defaults to v7. GLIBC 2.31 started to reject - # pre-v8 configurations with 2.31, and default v8 fails a subsequent test for - # using atomics (which are presumably, only available on some v8 CPUs). - # Therefore, default to v9. - if [ -z "${CT_GLIBC_SPARC_ALLOW_V7}" ]; then - CT_DoLog WARN "Setting CPU to V9 for sparc-linux. Set CT_ARCH_CPU if a different CPU is desired." - CT_ARCH_WITH_CPU="--with-cpu=v9" - fi - fi + if [ "${CT_ARCH_64}" = "y" ]; then + # By default, sparc64-*-linux is configured with -mcpu=v9. However, + # according to https://sourceware.org/ml/libc-alpha/2005-12/msg00027.html, + # "There is no Linux sparc64 port that runs on non-UltraSPARC-I+ ISA CPUs." + # There is a patch that would change the default to -mcpu=ultrasparc for + # sparc64-*-linux configuration: https://patchwork.ozlabs.org/patch/409424/ + # but that patch has not been integrated (yet). One concern raised about + # this patch was that -mcpu=ultrasparc can suboptimally schedule instructions + # for newer SPARC CPUs. So, override to -mcpu=ultrasparc and warn the user. + CT_DoLog WARN "Setting CPU to UltraSPARC-I for sparc64-linux. Set CT_ARCH_CPU if a different CPU is desired." + CT_ARCH_WITH_CPU="--with-cpu=ultrasparc" + if [ -n "${CT_ARCH_SUPPORTS_WITH_32_64}" -a -n "${CT_MULTILIB}" ]; then + CT_ARCH_WITH_CPU_32="--with-cpu-32=ultrasparc" + CT_ARCH_WITH_CPU_64="--with-cpu-64=ultrasparc" + fi + else + # Similarly, sparc-*-linux defaults to v7. GLIBC 2.31 started to reject + # pre-v8 configurations with 2.31, and default v8 fails a subsequent test for + # using atomics (which are presumably, only available on some v8 CPUs). + # Therefore, default to v9. + if [ -z "${CT_GLIBC_SPARC_ALLOW_V7}" ]; then + CT_DoLog WARN "Setting CPU to V9 for sparc-linux. Set CT_ARCH_CPU if a different CPU is desired." + CT_ARCH_WITH_CPU="--with-cpu=v9" + fi + fi fi } diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index 0b41c29..ab66f41 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -337,14 +337,14 @@ do_gcc_core_backend() { ;; libstdcxx) CT_DoLog EXTRA "Configuring libstdc++ for ${libstdcxx_name}" - if [ "${header_dir}" = "" ]; then - header_dir="${CT_PREFIX_DIR}/${libstdcxx_name}/include" - fi - if [ "${exec_prefix}" = "" ]; then - exec_prefix="${CT_PREFIX_DIR}/${libstdcxx_name}" - fi + if [ "${header_dir}" = "" ]; then + header_dir="${CT_PREFIX_DIR}/${libstdcxx_name}/include" + fi + if [ "${exec_prefix}" = "" ]; then + exec_prefix="${CT_PREFIX_DIR}/${libstdcxx_name}" + fi extra_config+=( "${CT_CC_SYSROOT_ARG[@]}" ) - extra_config+=( "--with-headers=${header_dir}" ) + extra_config+=( "--with-headers=${header_dir}" ) extra_user_config=( "${CT_CC_GCC_EXTRA_CONFIG_ARRAY[@]}" ) log_txt="libstdc++ ${libstdcxx_name} library" # to inhibit the libiberty and libgcc tricks later on @@ -356,7 +356,7 @@ do_gcc_core_backend() { esac if [ "${exec_prefix}" = "" ]; then - exec_prefix="${prefix}" + exec_prefix="${prefix}" fi case "${mode}" in @@ -654,7 +654,7 @@ do_gcc_core_backend() { --host=${host} \ --target=${CT_TARGET} \ --prefix="${prefix}" \ - --exec_prefix="${exec_prefix}" \ + --exec_prefix="${exec_prefix}" \ --with-local-prefix="${CT_SYSROOT_DIR}" \ "${extra_config[@]}" \ --enable-languages="${lang_list}" \ @@ -726,11 +726,11 @@ do_gcc_core_backend() { core_targets_all=all core_targets_install=install ;; - libstdcxx) - core_targets=( target-libstdc++-v3 ) - core_targets_all="${core_targets[@]/#/all-}" - core_targets_install="${core_targets[@]/#/install-}" - ;; + libstdcxx) + core_targets=( target-libstdc++-v3 ) + core_targets_all="${core_targets[@]/#/all-}" + core_targets_install="${core_targets[@]/#/install-}" + ;; esac CT_DoLog EXTRA "Building ${log_txt}" @@ -807,9 +807,9 @@ do_cc_for_build() { # lack of such a compiler, but better safe than sorry... build_final_opts+=( "mode=baremetal" ) build_final_opts+=( "build_libgcc=yes" ) - if [ "${CT_LIBC_NONE}" != "y" ]; then + if [ "${CT_LIBC_NONE}" != "y" ]; then build_final_opts+=( "build_libstdcxx=yes" ) - fi + fi build_final_opts+=( "build_libgfortran=yes" ) if [ "${CT_STATIC_TOOLCHAIN}" = "y" ]; then build_final_opts+=( "build_staticlinked=yes" ) @@ -898,9 +898,9 @@ do_cc_for_host() { if [ "${CT_BARE_METAL}" = "y" ]; then final_opts+=( "mode=baremetal" ) final_opts+=( "build_libgcc=yes" ) - if [ "${CT_LIBC_NONE}" != "y" ]; then + if [ "${CT_LIBC_NONE}" != "y" ]; then final_opts+=( "build_libstdcxx=yes" ) - fi + fi final_opts+=( "build_libgfortran=yes" ) if [ "${CT_STATIC_TOOLCHAIN}" = "y" ]; then final_opts+=( "build_staticlinked=yes" ) @@ -969,7 +969,7 @@ do_gcc_backend() { done if [ "${exec_prefix}" = "" ]; then - exec_prefix="${prefix}" + exec_prefix="${prefix}" fi # This function gets called for final gcc and libstdcxx. @@ -1280,7 +1280,7 @@ do_gcc_backend() { --host=${host} \ --target=${CT_TARGET} \ --prefix="${prefix}" \ - --exec_prefix="${exec_prefix}" \ + --exec_prefix="${exec_prefix}" \ ${CT_CC_SYSROOT_ARG} \ "${extra_config[@]}" \ --with-local-prefix="${CT_SYSROOT_DIR}" \ diff --git a/scripts/build/companion_libs/340-picolibc.sh b/scripts/build/companion_libs/340-picolibc.sh index cb96e71..e879005 100644 --- a/scripts/build/companion_libs/340-picolibc.sh +++ b/scripts/build/companion_libs/340-picolibc.sh @@ -32,18 +32,18 @@ do_cc_libstdcxx_picolibc() if [ "${CT_LIBC_PICOLIBC_GCC_LIBSTDCXX}" = "y" ]; then final_opts+=( "host=${CT_HOST}" ) - final_opts+=( "libstdcxx_name=picolibc" ) + final_opts+=( "libstdcxx_name=picolibc" ) final_opts+=( "prefix=${CT_PREFIX_DIR}" ) final_opts+=( "complibs=${CT_HOST_COMPLIBS_DIR}" ) final_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" ) final_opts+=( "ldflags=${CT_LDFLAGS_FOR_HOST}" ) final_opts+=( "lang_list=c,c++" ) final_opts+=( "build_step=libstdcxx" ) - final_opts+=( "extra_config+=('--enable-stdio=stdio_pure')" ) - final_opts+=( "extra_config+=('--disable-wchar_t')" ) - if [ "${CT_LIBC_PICOLIBC_ENABLE_TARGET_OPTSPACE}" = "y" ]; then - final_opts+=( "enable_optspace=yes" ) - fi + final_opts+=( "extra_config+=('--enable-stdio=stdio_pure')" ) + final_opts+=( "extra_config+=('--disable-wchar_t')" ) + if [ "${CT_LIBC_PICOLIBC_ENABLE_TARGET_OPTSPACE}" = "y" ]; then + final_opts+=( "enable_optspace=yes" ) + fi if [ "${CT_BARE_METAL}" = "y" ]; then final_opts+=( "mode=baremetal" ) @@ -107,7 +107,7 @@ RETARGETABLE_LOCKING:newlib-retargetable-locking done [ "${CT_USE_SYSROOT}" = "y" ] && \ - picolibc_opts+=( "-Dsysroot-install=true" ) + picolibc_opts+=( "-Dsysroot-install=true" ) [ "${CT_LIBC_PICOLIBC_EXTRA_SECTIONS}" = "y" ] && \ CT_LIBC_PICOLIBC_TARGET_CFLAGS="${CT_LIBC_PICOLIBC_TARGET_CFLAGS} -ffunction-sections -fdata-sections" @@ -122,11 +122,11 @@ RETARGETABLE_LOCKING:newlib-retargetable-locking # build : not used # host : the machine building picolibc # target : the machine picolibc runs on - meson_cflags="" - for cflag in ${cflags_for_target}; do - meson_cflags="${meson_cflags} '${cflag}'," - done - cat << EOF > picolibc-cross.txt + meson_cflags="" + for cflag in ${cflags_for_target}; do + meson_cflags="${meson_cflags} '${cflag}'," + done + cat << EOF > picolibc-cross.txt [binaries] c = '${CT_TARGET}-gcc' ar = '${CT_TARGET}-ar' @@ -149,9 +149,9 @@ EOF meson \ --cross-file picolibc-cross.txt \ --prefix="${CT_PREFIX_DIR}" \ - -Dincludedir=picolibc/include \ - -Dlibdir=picolibc/${CT_TARGET}/lib \ - -Dspecsdir="${CT_SYSROOT_DIR}"/lib \ + -Dincludedir=picolibc/include \ + -Dlibdir=picolibc/${CT_TARGET}/lib \ + -Dspecsdir="${CT_SYSROOT_DIR}"/lib \ "${CT_SRC_DIR}/picolibc" \ "${picolibc_opts[@]}" \ "${CT_LIBC_PICOLIBC_EXTRA_CONFIG_ARRAY[@]}" diff --git a/scripts/build/companion_libs/350-newlib_nano.sh b/scripts/build/companion_libs/350-newlib_nano.sh index f521be1..ad6ea9a 100644 --- a/scripts/build/companion_libs/350-newlib_nano.sh +++ b/scripts/build/companion_libs/350-newlib_nano.sh @@ -57,16 +57,16 @@ do_cc_libstdcxx_newlib_nano() if [ "${CT_NEWLIB_NANO_GCC_LIBSTDCXX}" = "y" ]; then final_opts+=( "host=${CT_HOST}" ) - final_opts+=( "libstdcxx_name=newlib-nano" ) + final_opts+=( "libstdcxx_name=newlib-nano" ) final_opts+=( "prefix=${CT_PREFIX_DIR}" ) final_opts+=( "complibs=${CT_HOST_COMPLIBS_DIR}" ) final_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" ) final_opts+=( "ldflags=${CT_LDFLAGS_FOR_HOST}" ) final_opts+=( "lang_list=c,c++" ) final_opts+=( "build_step=libstdcxx" ) - if [ "${CT_LIBC_NEWLIB_NANO_ENABLE_TARGET_OPTSPACE}" = "y" ]; then - final_opts+=( "enable_optspace=yes" ) - fi + if [ "${CT_LIBC_NEWLIB_NANO_ENABLE_TARGET_OPTSPACE}" = "y" ]; then + final_opts+=( "enable_optspace=yes" ) + fi if [ -n "${CT_NEWLIB_NANO_GCC_LIBSTDCXX_TARGET_CXXFLAGS}" ]; then final_opts+=( "extra_cxxflags_for_target=${CT_NEWLIB_NANO_GCC_LIBSTDCXX_TARGET_CXXFLAGS}" ) fi @@ -185,8 +185,8 @@ ENABLE_TARGET_OPTSPACE:target-optspace --host=${CT_BUILD} \ --target=${CT_TARGET} \ --prefix=${CT_PREFIX_DIR} \ - --exec-prefix=${CT_PREFIX_DIR}/newlib-nano \ - --libdir=${CT_PREFIX_DIR}/newlib-nano/${CT_TARGET}/lib \ + --exec-prefix=${CT_PREFIX_DIR}/newlib-nano \ + --libdir=${CT_PREFIX_DIR}/newlib-nano/${CT_TARGET}/lib \ "${newlib_opts[@]}" \ "${CT_LIBC_NEWLIB_NANO_EXTRA_CONFIG_ARRAY[@]}" diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index aecea1a..df77d5b 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -72,7 +72,7 @@ do_make_backend() "${CT_SRC_DIR}/make/configure" \ --host="${host}" \ --prefix="${prefix}" \ - "${extra_config[@]}" + "${extra_config[@]}" CT_DoLog EXTRA "Building make" CT_DoExecLog ALL make diff --git a/scripts/build/companion_tools/510-bison.sh b/scripts/build/companion_tools/510-bison.sh index 9379ea8..90bf9ec 100644 --- a/scripts/build/companion_tools/510-bison.sh +++ b/scripts/build/companion_tools/510-bison.sh @@ -56,7 +56,7 @@ do_bison_backend() "${CT_SRC_DIR}/bison/configure" \ --host="${host}" \ --prefix="${prefix}" \ - "${extra_config[@]}" + "${extra_config[@]}" CT_DoLog EXTRA "Building bison" CT_DoExecLog ALL make -- cgit v0.10.2-6-g49f6 From c320d220d65066688c80fffa7b85208e2bc06afc Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 8 Feb 2022 10:42:06 -0800 Subject: Turn off debugging in sample configuration Signed-off-by: Alexey Neyman diff --git a/samples/xtensa-fsf-elf/crosstool.config b/samples/xtensa-fsf-elf/crosstool.config index 2ddf9a0..a13c477 100644 --- a/samples/xtensa-fsf-elf/crosstool.config +++ b/samples/xtensa-fsf-elf/crosstool.config @@ -3,8 +3,6 @@ CT_OBSOLETE=y CT_EXPERIMENTAL=y CT_ALLOW_BUILD_AS_ROOT=y CT_ALLOW_BUILD_AS_ROOT_SURE=y -CT_DEBUG_CT=y -CT_DEBUG_CT_SAVE_STEPS=y CT_ARCH_XTENSA=y CT_MULTILIB=y CT_TARGET_CFLAGS="-mlongcalls" -- cgit v0.10.2-6-g49f6 From 93be629f2b255e348d0139558c5cd346a13787d2 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 8 Feb 2022 15:52:48 -0800 Subject: Fold libc_start_files into libc After 557b9d4, libc_start_files and libc_main steps are performed one after another. It doesn't make sense, especially since some of the libcs (glibc, uClibc-ng) go to great lengths to first install start files in the first step, libc_start_files, only to remove them immediately in the second step, libc_main. Current build steps also break in the xtensa newlib configurations, as it needs to install the custom xtensa headers before building the libgcc and after 557b9d4, the headers are not installed before libgcc is built in pass-1. Therefore, finish what 557b9d4 mentioned but did not do: move header installation into a new step, libc_headers, and combine libc_start_files and libc_main into a single step. This also allows to combine the core pass-1/pass-2 steps, to be done in a subsequent commit. Signed-off-by: Alexey Neyman diff --git a/ct-ng.in b/ct-ng.in index 05ca29d..e0ec0f8 100644 --- a/ct-ng.in +++ b/ct-ng.in @@ -268,6 +268,7 @@ build.%: # but are actual steps for canadian and cross-native. # Please keep the last line with a '\' and keep the following empty line: # it helps when diffing and merging. +# TBD move kernel headers and unify pass_1/pass_2? CT_STEPS := \ companion_tools_for_build \ companion_libs_for_build \ @@ -275,9 +276,9 @@ CT_STEPS := \ companion_tools_for_host \ companion_libs_for_host \ binutils_for_host \ + libc_headers \ cc_core_pass_1 \ kernel_headers \ - libc_start_files \ cc_core_pass_2 \ libc_main \ cc_for_build \ diff --git a/scripts/build/libc.sh b/scripts/build/libc.sh index 0d03bf0..5f5aa6f 100644 --- a/scripts/build/libc.sh +++ b/scripts/build/libc.sh @@ -6,7 +6,7 @@ # The actual implementation can override just what it needs then. eval "${CT_LIBC//[^A-Za-z0-9]/_}_get() { CT_Fetch \"\${CT_LIBC_${CT_LIBC_CHOICE_KSYM}_PKG_KSYM}\"; }" eval "${CT_LIBC//[^A-Za-z0-9]/_}_extract() { CT_ExtractPatch \"\${CT_LIBC_${CT_LIBC_CHOICE_KSYM}_PKG_KSYM}\"; }" -for _m in start_files main post_cc; do +for _m in headers main post_cc; do eval "${CT_LIBC//[^A-Za-z0-9]/_}_${_m}() { :; }" done @@ -23,9 +23,9 @@ do_libc_extract() eval "${CT_LIBC//[^A-Za-z0-9]/_}_extract" } -do_libc_start_files() +do_libc_headers() { - eval "${CT_LIBC//[^A-Za-z0-9]/_}_start_files" + eval "${CT_LIBC//[^A-Za-z0-9]/_}_headers" } do_libc_main() diff --git a/scripts/build/libc/bionic.sh b/scripts/build/libc/bionic.sh index e122d86..0ffd4d8 100644 --- a/scripts/build/libc/bionic.sh +++ b/scripts/build/libc/bionic.sh @@ -3,7 +3,7 @@ # Licensed under the GPL v2. See COPYING in the root of this package # Install Unified headers -bionic_start_files() +bionic_headers() { CT_DoStep INFO "Installing C library headers" CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/sysroot/usr" "${CT_SYSROOT_DIR}" diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 0db7c1c..c78f069 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -30,48 +30,14 @@ glibc_extract() fi } -# Build and install headers and start files -glibc_start_files() -{ - # Start files and Headers should be configured the same way as the - # final libc, but built and installed differently. - glibc_backend libc_mode=startfiles -} - # This function builds and install the full C library glibc_main() { - glibc_backend libc_mode=final -} - -# This backend builds the C library once for each multilib -# variant the compiler gives us -# Usage: glibc_backend param=value [...] -# Parameter : Definition : Type : Default -# libc_mode : 'startfiles' or 'final' : string : (none) -glibc_backend() -{ - local libc_mode local arg - for arg in "$@"; do - eval "${arg// /\\ }" - done - - case "${libc_mode}" in - startfiles) - CT_DoStep INFO "Installing C library headers & start files" - ;; - final) - CT_DoStep INFO "Installing C library" - ;; - *) - CT_Abort "Unsupported (or unset) libc_mode='${libc_mode}'" - ;; - esac - - CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc-${libc_mode}" - CT_IterateMultilibs glibc_backend_once multilib libc_mode="${libc_mode}" + CT_DoStep INFO "Installing C library" + CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc" + CT_IterateMultilibs glibc_backend_once multilib CT_Popd CT_EndStep } @@ -79,13 +45,14 @@ glibc_backend() # This backend builds the C library once # Usage: glibc_backend_once param=value [...] # Parameter : Definition : Type -# libc_mode : 'startfiles' or 'final' : string : (empty) # multi_* : as defined in CT_IterateMultilibs : (varies) : glibc_backend_once() { + # Glibc seems to be smart enough to know about the cases that can coexist + # in the same root and installs them into proper multilib-os directory; all + # we need is to point to the right root. local multi_flags multi_dir multi_os_dir multi_root multi_index multi_count multi_target local build_cflags build_cppflags build_ldflags - local startfiles_dir local src_dir="${CT_SRC_DIR}/glibc" local -a extra_config local -a extra_make_args @@ -104,29 +71,9 @@ glibc_backend_once() # Adjust target tuple according GLIBC quirks CT_DoArchGlibcAdjustTuple multi_target - # Glibc seems to be smart enough to know about the cases that can coexist - # in the same root and installs them into proper multilib-os directory; all - # we need is to point to the right root. We do need to handle multilib-os - # here, though, for the first pass where we install crt*.o and a dummy - # libc.so; we therefore install it to the most specific location of - # //usr/lib/ where it is least likely to clash - # with other multilib variants. We then remove these temporary files at - # the beginning of the libc-final step and allow glibc to install them - # where it thinks is proper. - startfiles_dir="${multi_root}/usr/lib/${multi_os_dir}" - CT_SanitizeVarDir startfiles_dir - - if [ "${libc_mode}" = "final" ]; then - CT_DoLog EXTRA "Cleaning up start files" - CT_DoExecLog ALL rm -f "${startfiles_dir}/crt1.o" \ - "${startfiles_dir}/crti.o" \ - "${startfiles_dir}/crtn.o" \ - "${startfiles_dir}/libc.so" - fi - CT_DoLog EXTRA "Configuring C library" - # Also, if those two are missing, iconv build breaks + # If those two are missing, iconv build breaks extra_config+=( --disable-debug --disable-sanity-checks ) if [ "${CT_GLIBC_ENABLE_OBSOLETE_RPC}" = "y" ]; then @@ -259,7 +206,6 @@ glibc_backend_once() CT_DoLog DEBUG "Configuring with addons : '$(glibc_add_ons_list ,)'" CT_DoLog DEBUG "Extra config args passed : '${extra_config[*]}'" CT_DoLog DEBUG "Extra CFLAGS passed : '${glibc_cflags}'" - CT_DoLog DEBUG "Placing startfiles into : '${startfiles_dir}'" CT_DoLog DEBUG "Configuring with --host : '${multi_target}'" # CFLAGS are only applied when compiling .c files. .S files are compiled with ASFLAGS, @@ -324,111 +270,34 @@ glibc_backend_once() extra_make_args+=( "BUILD_CPPFLAGS=${build_cppflags}" ) extra_make_args+=( "BUILD_LDFLAGS=${build_ldflags}" ) - if [ "${libc_mode}" = "startfiles" -a ! -r "${multi_root}/.libc_headers_installed" ]; then - CT_DoLog EXTRA "Installing C library headers" - CT_DoExecLog ALL touch "${multi_root}/.libc_headers_installed" - - # use the 'install-headers' makefile target to install the - # headers - CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ - install_root=${multi_root} \ - install-bootstrap-headers=yes \ - "${extra_make_args[@]}" \ - install-headers - - # Two headers -- stubs.h and features.h -- aren't installed by install-headers, - # so do them by hand. We can tolerate an empty stubs.h for the moment. - # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html - mkdir -p "${CT_HEADERS_DIR}/gnu" - CT_DoExecLog ALL touch "${CT_HEADERS_DIR}/gnu/stubs.h" - CT_DoExecLog ALL cp -v "${CT_SRC_DIR}/glibc/include/features.h" \ - "${CT_HEADERS_DIR}/features.h" - - # Building the bootstrap gcc requires either setting inhibit_libc, or - # having a copy of stdio_lim.h... see - # http://sources.redhat.com/ml/libc-alpha/2003-11/msg00045.html - CT_DoExecLog ALL cp -v bits/stdio_lim.h "${CT_HEADERS_DIR}/bits/stdio_lim.h" - - # Following error building gcc-4.0.0's gcj: - # error: bits/syscall.h: No such file or directory - # solved by following copy; see http://sourceware.org/ml/crossgcc/2005-05/msg00168.html - # but it breaks arm, see http://sourceware.org/ml/crossgcc/2006-01/msg00091.html - # Of course, only copy it if it does not already exist - case "${CT_ARCH}" in - arm) ;; - *) if [ -f "${CT_HEADERS_DIR}/bits/syscall.h" ]; then - CT_DoLog ALL "Not over-writing existing bits/syscall.h" - elif [ -f "misc/bits/syscall.h" ]; then - CT_DoExecLog ALL cp -v "misc/bits/syscall.h" \ - "${CT_HEADERS_DIR}/bits/syscall.h" - else - # "Old" glibces do not have the above file, - # but provide this one: - CT_DoExecLog ALL cp -v "misc/syscall-list.h" \ - "${CT_HEADERS_DIR}/bits/syscall.h" - fi - ;; - esac - elif [ "${libc_mode}" = "final" -a -r "${multi_root}/.libc_headers_installed" ]; then - CT_DoExecLog ALL rm -f "${multi_root}/.libc_headers_installed" - fi # installing headers - - if [ "${libc_mode}" = "startfiles" ]; then - if [ "${CT_THREADS}" = "nptl" ]; then - CT_DoLog EXTRA "Installing C library start files" - - # there are a few object files needed to link shared libraries, - # which we build and install by hand - CT_DoExecLog ALL mkdir -p "${startfiles_dir}" - CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ - "${extra_make_args[@]}" \ - csu/subdir_lib - CT_DoExecLog ALL cp csu/crt1.o csu/crti.o csu/crtn.o \ - "${startfiles_dir}" - - # Finally, 'libgcc_s.so' requires a 'libc.so' to link against. - # However, since we will never actually execute its code, - # it doesn't matter what it contains. So, treating '/dev/null' - # as a C source file, we produce a dummy 'libc.so' in one step - CT_DoExecLog ALL "${CT_TARGET}-${CT_CC}" ${multi_flags} \ - -nostdlib \ - -nostartfiles \ - -shared \ - -x c /dev/null \ - -o "${startfiles_dir}/libc.so" - fi # threads == nptl - fi # libc_mode = startfiles - - if [ "${libc_mode}" = "final" ]; then - CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ - "${extra_make_args[@]}" \ - all - - CT_DoLog EXTRA "Installing C library" - CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ - "${extra_make_args[@]}" \ - install_root="${multi_root}" \ - install - - if [ "${CT_BUILD_MANUALS}" = "y" -a "${multi_index}" = "${multi_count}" ]; then - # We only need to build the manuals once. Only build them on the - # last multilib target. If it's not multilib, it will happen on the - # only target. - CT_DoLog EXTRA "Building and installing the C library manual" - # Omit CT_JOBSFLAGS as GLIBC has problems building the - # manuals in parallel - CT_DoExecLog ALL make pdf html - CT_DoExecLog ALL mkdir -p ${CT_PREFIX_DIR}/share/doc - CT_DoExecLog ALL cp -av manual/*.pdf \ - manual/libc \ - ${CT_PREFIX_DIR}/share/doc - fi - - if [ "${CT_GLIBC_LOCALES}" = "y" -a "${multi_index}" = "${multi_count}" ]; then - glibc_locales - fi - fi # libc_mode = final + CT_DoLog EXTRA "Building C library" + CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ + "${extra_make_args[@]}" \ + all + + CT_DoLog EXTRA "Installing C library" + CT_DoExecLog ALL make ${CT_JOBSFLAGS} \ + "${extra_make_args[@]}" \ + install_root="${multi_root}" \ + install + + if [ "${CT_BUILD_MANUALS}" = "y" -a "${multi_index}" = "${multi_count}" ]; then + # We only need to build the manuals once. Only build them on the + # last multilib target. If it's not multilib, it will happen on the + # only target. + CT_DoLog EXTRA "Building and installing the C library manual" + # Omit CT_JOBSFLAGS as GLIBC has problems building the + # manuals in parallel + CT_DoExecLog ALL make pdf html + CT_DoExecLog ALL mkdir -p ${CT_PREFIX_DIR}/share/doc + CT_DoExecLog ALL cp -av manual/*.pdf \ + manual/libc \ + ${CT_PREFIX_DIR}/share/doc + fi + + if [ "${CT_GLIBC_LOCALES}" = "y" -a "${multi_index}" = "${multi_count}" ]; then + glibc_locales + fi CT_EndStep } diff --git a/scripts/build/libc/mingw-w64.sh b/scripts/build/libc/mingw-w64.sh index 60f514a..54e8d07 100644 --- a/scripts/build/libc/mingw-w64.sh +++ b/scripts/build/libc/mingw-w64.sh @@ -9,7 +9,7 @@ mingw_w64_set_install_prefix() fi } -mingw_w64_start_files() { +mingw_w64_headers() { local -a sdk_opts CT_DoStep INFO "Installing C library headers" diff --git a/scripts/build/libc/moxiebox.sh b/scripts/build/libc/moxiebox.sh index 25ef6e7..35e2ea4 100644 --- a/scripts/build/libc/moxiebox.sh +++ b/scripts/build/libc/moxiebox.sh @@ -14,9 +14,9 @@ moxiebox_extract() CT_ExtractPatch MOXIEBOX } -moxiebox_start_files() +moxiebox_headers() { - newlib_start_files + newlib_headers } moxiebox_main() diff --git a/scripts/build/libc/musl.sh b/scripts/build/libc/musl.sh index 05da1d4..bc2a2e6 100644 --- a/scripts/build/libc/musl.sh +++ b/scripts/build/libc/musl.sh @@ -2,42 +2,18 @@ # Copyright 2013 Timo Teräs # Licensed under the GPL v2. See COPYING in the root of this package -# Build and install headers and start files -musl_start_files() +musl_post_cc() { - # Start files and Headers should be configured the same way as the - # final libc, but built and installed differently. - musl_backend libc_mode=startfiles -} - -# This function builds and install the full C library -musl_main() -{ - musl_backend libc_mode=final -} - -musl_post_cc() { # MUSL creates dynamic linker symlink with absolute path - which works on the # target but not on the host. We want our cross-ldd tool to work. CT_MultilibFixupLDSO } -musl_backend() { - local libc_mode - local arg - - for arg in "$@"; do - eval "${arg// /\\ }" - done - - case "${libc_mode}" in - startfiles) CT_DoStep INFO "Installing C library headers & start files";; - final) CT_DoStep INFO "Installing C library";; - *) CT_Abort "Unsupported (or unset) libc_mode='${libc_mode}'";; - esac - - CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc-${libc_mode}" - CT_IterateMultilibs musl_backend_once multilib libc_mode="${libc_mode}" +musl_main() +{ + CT_DoStep INFO "Installing C library" + CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc" + CT_IterateMultilibs musl_backend_once multilib CT_Popd CT_EndStep } @@ -45,9 +21,9 @@ musl_backend() { # This backend builds the C library # Usage: musl_backend param=value [...] # Parameter : Definition : Type : Default -# libc_mode : 'startfiles' or 'final' : string : (none) -musl_backend_once() { - local libc_mode +# multi_* : as defined in CT_IterateMultilibs : (varies) : +musl_backend_once() +{ local -a extra_cflags local -a extra_config local src_dir="${CT_SRC_DIR}/musl" @@ -110,45 +86,26 @@ musl_backend_once() { --disable-gcc-wrapper \ "${extra_config[@]}" - if [ "${libc_mode}" = "startfiles" ]; then - CT_DoLog EXTRA "Installing C library headers" - CT_DoExecLog ALL make DESTDIR="${multi_root}" install-headers - CT_DoLog EXTRA "Building C library start files" - CT_DoExecLog ALL make DESTDIR="${multi_root}" \ - obj/crt/crt1.o obj/crt/crti.o obj/crt/crtn.o - CT_DoLog EXTRA "Installing C library start files" - CT_DoExecLog ALL cp -av obj/crt/crt*.o "${multi_root}${multilib_dir}" - CT_DoExecLog ALL ${CT_TARGET}-${CT_CC} -nostdlib \ - -nostartfiles -shared -x c /dev/null -o "${multi_root}${multilib_dir}/libc.so" - fi - if [ "${libc_mode}" = "final" ]; then - CT_DoLog EXTRA "Cleaning up start files" - CT_DoExecLog ALL rm -f "${multi_root}${multilib_dir}/crt1.o" \ - "${multi_root}${multilib_dir}/crti.o" \ - "${multi_root}${multilib_dir}/crtn.o" \ - "${multi_root}${multilib_dir}/libc.so" - - CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL make ${CT_JOBSFLAGS} - - CT_DoLog EXTRA "Installing C library" - CT_DoExecLog ALL make DESTDIR="${multi_root}" install - - # Convert /lib/ld-* symlinks to relative paths so that they are valid - # both on the host and on the target. - for f in ${multi_root}/ld-musl-*; do - [ -L "${f}" ] || continue - l=$( readlink ${f} ) - case "${l}" in - ${multilib_dir}/*) - CT_DoExecLog ALL ln -sf "../${l}" "${f}" - ;; - esac - done - - # Any additional actions for this architecture - CT_DoArchMUSLPostInstall - fi + CT_DoLog EXTRA "Building C library" + CT_DoExecLog ALL make ${CT_JOBSFLAGS} + + CT_DoLog EXTRA "Installing C library" + CT_DoExecLog ALL make DESTDIR="${multi_root}" install + + # Convert /lib/ld-* symlinks to relative paths so that they are valid + # both on the host and on the target. + for f in ${multi_root}/ld-musl-*; do + [ -L "${f}" ] || continue + l=$( readlink ${f} ) + case "${l}" in + ${multilib_dir}/*) + CT_DoExecLog ALL ln -sf "../${l}" "${f}" + ;; + esac + done + + # Any additional actions for this architecture + CT_DoArchMUSLPostInstall CT_EndStep } diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index ddecdb1..72111a9 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -5,11 +5,10 @@ # Edited by Martin Lund # -newlib_start_files() +newlib_headers() { - CT_DoStep INFO "Installing C library headers & start files" - CT_DoExecLog ALL cp -a "${CT_SRC_DIR}/newlib/newlib/libc/include/." \ - "${CT_HEADERS_DIR}" + CT_DoStep INFO "Installing C library headers" + CT_DoExecLog ALL cp -a "${CT_SRC_DIR}/newlib/newlib/libc/include/." "${CT_HEADERS_DIR}" if [ "${CT_ARCH_XTENSA}" = "y" ]; then CT_DoLog EXTRA "Installing Xtensa headers" CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/newlib/newlib/libc/sys/xtensa/include/." \ diff --git a/scripts/build/libc/uClibc-ng.sh b/scripts/build/libc/uClibc-ng.sh index 16ebc2c..5b26049 100644 --- a/scripts/build/libc/uClibc-ng.sh +++ b/scripts/build/libc/uClibc-ng.sh @@ -2,38 +2,12 @@ # Copyright 2007 Yann E. MORIN # Licensed under the GPL v2. See COPYING in the root of this package -# Build and install headers and start files -uClibc_ng_start_files() -{ - # Start files and Headers should be configured the same way as the - # final libc, but built and installed differently. - uClibc_ng_backend libc_mode=startfiles -} - # This function builds and install the full C library uClibc_ng_main() { - uClibc_ng_backend libc_mode=final -} - -# Common backend for 1st and 2nd passes. -uClibc_ng_backend() -{ - local libc_mode - local arg - - for arg in "$@"; do - eval "${arg// /\\ }" - done - - case "${libc_mode}" in - startfiles) CT_DoStep INFO "Installing C library headers & start files";; - final) CT_DoStep INFO "Installing C library";; - *) CT_Abort "Unsupported (or unset) libc_mode='${libc_mode}'";; - esac - - CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc-${libc_mode}" - CT_IterateMultilibs uClibc_ng_backend_once multilib libc_mode="${libc_mode}" + CT_DoStep INFO "Installing C library" + CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc" + CT_IterateMultilibs uClibc_ng_backend_once multilib CT_Popd CT_EndStep } @@ -41,7 +15,6 @@ uClibc_ng_backend() # Common backend for 1st and 2nd passes, once per multilib. uClibc_ng_backend_once() { - local libc_mode local multi_dir multi_os_dir multi_root multi_flags multi_index multi_count local multilib_dir startfiles_dir local jflag=${CT_JOBSFLAGS} @@ -129,65 +102,11 @@ uClibc_ng_backend_once() CT_DoExecLog ALL cp -a "${multi_root}/usr/include" "${multi_root}/usr/include.saved" fi - if [ "${libc_mode}" = "startfiles" ]; then - CT_DoLog EXTRA "Building headers" - CT_DoExecLog ALL make "${make_args[@]}" headers - - # Ensure the directory for installing multilib-specific binaries exists. - CT_DoExecLog ALL mkdir -p "${startfiles_dir}" - - CT_DoLog EXTRA "Installing headers" - CT_DoExecLog ALL make "${make_args[@]}" install_headers - - # The check might look bogus, but it is the same condition as is used - # by GCC build script to enable/disable shared library support. - if [ "${CT_THREADS}" = "nptl" ]; then - CT_DoLog EXTRA "Building start files" - CT_DoExecLog ALL make ${jflag} "${make_args[@]}" \ - lib/crt1.o lib/crti.o lib/crtn.o - - if [ "${CT_SHARED_LIBS}" = "y" ]; then - # From: http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=ad5668a7ac7e0436db92e55caaf3fdf782b6ba3b - # libm.so is needed for ppc, as libgcc is linked against libm.so - # No problem to create it for other archs. - CT_DoLog EXTRA "Building dummy shared libs" - CT_DoExecLog ALL "${CT_TARGET}-${CT_CC}" -nostdlib -nostartfiles \ - -shared ${multi_flags} -x c /dev/null -o libdummy.so - - CT_DoLog EXTRA "Installing start files" - CT_DoExecLog ALL install -m 0644 lib/crt1.o lib/crti.o lib/crtn.o \ - "${startfiles_dir}" - - CT_DoLog EXTRA "Installing dummy shared libs" - CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libc.so" - CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libm.so" - fi # CT_SHARED_LIBS == y - fi # CT_THREADS == nptl - fi # libc_mode == startfiles - - if [ "${libc_mode}" = "final" ]; then - CT_DoLog EXTRA "Cleaning up startfiles" - CT_DoExecLog ALL rm -f "${startfiles_dir}/crt1.o" \ - "${startfiles_dir}/crti.o" \ - "${startfiles_dir}/crtn.o" \ - "${startfiles_dir}/libc.so" \ - "${startfiles_dir}/libm.so" - - CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL make "${make_args[@]}" pregen - CT_DoExecLog ALL make ${jflag} "${make_args[@]}" all - - # YEM-FIXME: - # - we want to install 'runtime' files, eg. lib*.{a,so*}, crti.o and - # such files, except the headers as they already are installed - # - "make install_dev" installs the headers, the crti.o... and the - # static libs, but not the dynamic libs - # - "make install_runtime" installs the dynamic libs only - # - "make install" calls install_runtime and install_dev - # - so we're left with re-installing the headers... Sigh... - CT_DoLog EXTRA "Installing C library" - CT_DoExecLog ALL make "${make_args[@]}" install install_utils - fi # libc_mode == final + CT_DoLog EXTRA "Building C library" + CT_DoExecLog ALL make "${make_args[@]}" pregen + CT_DoExecLog ALL make ${jflag} "${make_args[@]}" all + CT_DoLog EXTRA "Installing C library" + CT_DoExecLog ALL make "${make_args[@]}" install install_utils # Now, if installing headers into a subdirectory, put everything in its place. # Remove the header subdirectory if it existed already. -- cgit v0.10.2-6-g49f6 From 5a0be8b4ec0f1b7ff4fe30c8caaa5285b4f11ae4 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 8 Feb 2022 17:25:12 -0800 Subject: Unify core passes With libc_headers step before pass-1, there is no need to distinguish pass-1 and pass-2; they are configured identically (note that with the current configuration, core pass-2 is only used for win32 - hence, uses build_libgcc=yes and mode=static). Signed-off-by: Alexey Neyman diff --git a/TODO b/TODO index 52d0637..d030a9c 100644 --- a/TODO +++ b/TODO @@ -75,7 +75,7 @@ A (slightly) ordered set of tasks for crosstool-NG. Written in a cryptic languag [ ] add passthrough to configure, for host/target [ ] Read/spellcheck configs & scripts [ ] 'ct-ng olddefconfig' -[ ] Install a "trap" C++ compiler as ${CT_TARGET}-g++ during pass-1/pass-2 to trap attempts to compile target code with g++ (currently glibc detects host g++ and warns that it uses g++ w/o target triplet) +[ ] Install a "trap" C++ compiler as ${CT_TARGET}-g++ during core compiler build to trap attempts to compile target code with g++ (currently glibc detects host g++ and warns that it uses g++ w/o target triplet) [ ] Somehow it needs to be functional during the configure step - export env var while running in CT_DoExecLog with CFG level, and forward it to host compiler? [ ] elf2flt not compatible with multiple linkers enabled in binutils (ld.bfd + ld.gold) - fix upstream? [ ] Companion libs diff --git a/config/cc.in b/config/cc.in index 0890cc2..3a16805 100644 --- a/config/cc.in +++ b/config/cc.in @@ -2,10 +2,7 @@ menu "C compiler" -config CC_CORE_PASS_1_NEEDED - bool - -config CC_CORE_PASS_2_NEEDED +config CC_CORE_NEEDED bool config CC_SUPPORT_CXX diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 742d563..a708bb8 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -55,7 +55,7 @@ config CC_GCC_ENABLE_CXX_FLAGS config CC_GCC_CORE_EXTRA_CONFIG_ARRAY string "Core gcc extra config" default "" - depends on CC_CORE_PASS_1_NEEDED || CC_CORE_PASS_2_NEEDED + depends on CC_CORE_NEEDED help Extra flags to pass onto ./configure when configuring the core gcc. diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 39c2c20..3da38bd 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -3,7 +3,7 @@ ## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU ## select LIBC_SUPPORT_THREADS_NATIVE -## select CC_CORE_PASS_1_NEEDED +## select CC_CORE_NEEDED # TBD: select GETTEXT for build only, not for host ## select GETTEXT_NEEDED ## select BINUTILS_FORCE_LD_BFD_DEFAULT diff --git a/config/libc/mingw-w64.in b/config/libc/mingw-w64.in index 1880f08..2531fef 100644 --- a/config/libc/mingw-w64.in +++ b/config/libc/mingw-w64.in @@ -4,7 +4,7 @@ ## ## select LIBC_SUPPORT_THREADS_NATIVE ## select LIBC_SUPPORT_THREADS_POSIX -## select CC_CORE_PASS_2_NEEDED +## select CC_CORE_NEEDED ## select BINUTILS_FORCE_LD_BFD_DEFAULT ## ## help The de-facto standard for Mingw distributions. diff --git a/config/libc/moxiebox.in b/config/libc/moxiebox.in index aa6ff53..07fc333 100644 --- a/config/libc/moxiebox.in +++ b/config/libc/moxiebox.in @@ -10,7 +10,7 @@ ## select LIBC_SUPPORT_THREADS_NONE ## select COMP_TOOLS_AUTOCONF if !CONFIGURE_has_autoconf_2_65_or_newer || !CONFIGURE_has_autoreconf_2_64_or_newer ## select COMP_TOOLS_AUTOMAKE if !CONFIGURE_has_automake_1_15_or_newer -## select CC_CORE_PASS_1_NEEDED +## select CC_CORE_NEEDED ## select LIBELF_NEEDED ## ## help Secure execution runtime for Moxie architecture. diff --git a/config/libc/musl.in b/config/libc/musl.in index 0ea388e..db7abb7 100644 --- a/config/libc/musl.in +++ b/config/libc/musl.in @@ -3,7 +3,7 @@ ## depends on ! WINDOWS && ! BARE_METAL ## depends on EXPERIMENTAL ## select LIBC_SUPPORT_THREADS_NATIVE -## select CC_CORE_PASS_1_NEEDED +## select CC_CORE_NEEDED ## help Musl is a new standard library to power a new generation of Linux-based ## help devices. musl is lightweight, fast, simple, free, and strives to be diff --git a/config/libc/newlib.in b/config/libc/newlib.in index 83ae4b1..f1cb29b 100644 --- a/config/libc/newlib.in +++ b/config/libc/newlib.in @@ -3,7 +3,7 @@ ## depends on BARE_METAL ## select LIBC_PROVIDES_CXA_ATEXIT ## select LIBC_SUPPORT_THREADS_NONE -## select CC_CORE_PASS_1_NEEDED +## select CC_CORE_NEEDED ## help Newlib is a C library intended for use on embedded systems. It is a ## help conglomeration of several library parts, all under free software diff --git a/config/libc/uClibc-ng.in b/config/libc/uClibc-ng.in index 705c0d4..dc83ca7 100644 --- a/config/libc/uClibc-ng.in +++ b/config/libc/uClibc-ng.in @@ -5,7 +5,7 @@ ## select LIBC_SUPPORT_THREADS_LT ## select LIBC_SUPPORT_THREADS_NONE ## select LIBC_SUPPORT_THREADS_NATIVE -## select CC_CORE_PASS_1_NEEDED +## select CC_CORE_NEEDED ## ## help The de-facto standard for embeded linux systems. ## help diff --git a/ct-ng.in b/ct-ng.in index e0ec0f8..75e09ac 100644 --- a/ct-ng.in +++ b/ct-ng.in @@ -268,7 +268,6 @@ build.%: # but are actual steps for canadian and cross-native. # Please keep the last line with a '\' and keep the following empty line: # it helps when diffing and merging. -# TBD move kernel headers and unify pass_1/pass_2? CT_STEPS := \ companion_tools_for_build \ companion_libs_for_build \ @@ -277,9 +276,8 @@ CT_STEPS := \ companion_libs_for_host \ binutils_for_host \ libc_headers \ - cc_core_pass_1 \ kernel_headers \ - cc_core_pass_2 \ + cc_core \ libc_main \ cc_for_build \ cc_for_host \ diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index ab66f41..9623d6c 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -134,7 +134,7 @@ evaluate_multilib_cflags() # 1. On MIPS target, gcc (or rather, ld, which it invokes under the hood) chokes # if supplied with two -mabi=* options. I.e., 'gcc -mabi=n32' and 'gcc -mabi=32' both # work, but 'gcc -mabi=32 -mabi=n32' produces an internal error in ld. Thus we do -# not supply target's CFLAGS in multilib builds - and after compiling pass-1 gcc, +# not supply target's CFLAGS in multilib builds - and after compiling core gcc, # attempt to determine which CFLAGS need to be filtered out. # # 2. If "demultilibing" is in effect, create top-level directories for any @@ -186,11 +186,10 @@ cc_gcc_multilib_housekeeping() { } #------------------------------------------------------------------------------ -# Core gcc pass 1 -do_cc_core_pass_1() { +do_cc_core() { local -a core_opts - if [ "${CT_CC_CORE_PASS_1_NEEDED}" != "y" ]; then + if [ "${CT_CC_CORE_NEEDED}" != "y" ]; then return 0 fi @@ -201,62 +200,12 @@ do_cc_core_pass_1() { core_opts+=( "cflags=${CT_CFLAGS_FOR_BUILD}" ) core_opts+=( "ldflags=${CT_LDFLAGS_FOR_BUILD}" ) core_opts+=( "lang_list=c" ) - core_opts+=( "build_step=core1" ) + core_opts+=( "build_step=core" ) core_opts+=( "mode=static" ) core_opts+=( "build_libgcc=yes" ) - CT_DoStep INFO "Installing pass-1 core C gcc compiler" - CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-gcc-core-pass-1" - - do_gcc_core_backend "${core_opts[@]}" - - CT_Popd - CT_EndStep -} - -# Core gcc pass 2 -do_cc_core_pass_2() { - local -a core_opts - - if [ "${CT_CC_CORE_PASS_2_NEEDED}" != "y" ]; then - return 0 - fi - - # Common options: - core_opts+=( "host=${CT_BUILD}" ) - core_opts+=( "prefix=${CT_BUILDTOOLS_PREFIX_DIR}" ) - core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" ) - core_opts+=( "cflags=${CT_CFLAGS_FOR_BUILD}" ) - core_opts+=( "ldflags=${CT_LDFLAGS_FOR_BUILD}" ) - core_opts+=( "lang_list=c" ) - core_opts+=( "build_step=core2" ) - - # Different conditions are at stake here: - # - In case the threading model is NPTL, we need a shared-capable core - # gcc; in all other cases, we need a static-only core gcc. - # - In case the threading model is NPTL or win32, or gcc is 4.3 or - # later, we need to build libgcc - case "${CT_THREADS}" in - nptl) - if [ "${CT_SHARED_LIBS}" = "y" ]; then - core_opts+=( "mode=shared" ) - else - core_opts+=( "mode=static" ) - fi - core_opts+=( "build_libgcc=yes" ) - ;; - win32) - core_opts+=( "mode=static" ) - core_opts+=( "build_libgcc=yes" ) - ;; - *) - core_opts+=( "mode=static" ) - core_opts+=( "build_libgcc=yes" ) - ;; - esac - - CT_DoStep INFO "Installing pass-2 core C gcc compiler" - CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-gcc-core-pass-2" + CT_DoStep INFO "Installing core C gcc compiler" + CT_mkdir_pushd "${CT_BUILD_DIR}/build-cc-gcc-core" do_gcc_core_backend "${core_opts[@]}" @@ -281,9 +230,8 @@ do_cc_core_pass_2() { # build_manuals : whether to build manuals or not : bool : no # cflags : cflags to use : string : (empty) # ldflags : ldflags to use : string : (empty) -# build_step : build step 'core1', 'core2', 'gcc_build', -# 'libstdcxx' -# or 'gcc_host' : string : (none) +# build_step : build step 'core', 'gcc_build', +# 'libstdcxx' or 'gcc_host' : string : (none) # Usage: do_gcc_core_backend mode=[static|shared|baremetal] build_libgcc=[yes|no] build_staticlinked=[yes|no] do_gcc_core_backend() { local mode @@ -321,7 +269,7 @@ do_gcc_core_backend() { # This function gets called in case of a bare metal compiler for the final gcc, too. case "${build_step}" in - core1|core2) + core) CT_DoLog EXTRA "Configuring core C gcc compiler" log_txt="gcc" extra_config+=( "${CT_CC_CORE_SYSROOT_ARG[@]}" ) @@ -351,7 +299,7 @@ do_gcc_core_backend() { build_libgcc=no ;; *) - CT_Abort "Internal Error: 'build_step' must be one of: 'core1', 'core2', 'gcc_build', 'gcc_host' or 'libstdcxx', not '${build_step:-(empty)}'" + CT_Abort "Internal Error: 'build_step' must be one of: 'core', 'gcc_build', 'gcc_host' or 'libstdcxx', not '${build_step:-(empty)}'" ;; esac @@ -501,8 +449,6 @@ do_gcc_core_backend() { if [ "${CT_LIBC_GLIBC}" = "y" ]; then # Report GLIBC's version to GCC, it affects the defaults on other options. - # Pass-2 should be able to get it from the headers, but for some options - # (such as --with-long-double-128) we need to get it right even in pass-1. # GCC expects just two numbers separated by a dot. local glibc_version @@ -571,11 +517,10 @@ do_gcc_core_backend() { # Some versions of gcc have a defective --enable-multilib. # Since that's the default, only pass --disable-multilib. For multilib, - # also enable multiarch. Without explicit --enable-multiarch, pass-1 - # compiler is configured as multilib/no-multiarch and pass-2/final - # are multilib/multiarch (because gcc autodetects multiarch based on - # multiple instances of crt*.o in the install directory - which do - # not exist in pass-1). + # also enable multiarch. Without explicit --enable-multiarch, core + # compiler is configured as multilib/no-multiarch (because gcc autodetects + # multiarch based on multiple instances of crt*.o in the install directory + # which do not exist in the core pass). if [ "${CT_MULTILIB}" != "y" ]; then extra_config+=("--disable-multilib") else @@ -609,7 +554,7 @@ do_gcc_core_backend() { fi # For non-sysrooted toolchain, GCC doesn't search except at the installation - # prefix; in core-1/2 stage we use a temporary installation prefix - but + # prefix; in core stage we use a temporary installation prefix - but # we may have installed something into the final prefix. This is less than ideal: # in the installation prefix GCC also handles subdirectories for multilibs # (e.g. first trying ${prefix}/include/${arch-triplet}) but diff --git a/scripts/build/libc/uClibc-ng.sh b/scripts/build/libc/uClibc-ng.sh index 5b26049..7b81d92 100644 --- a/scripts/build/libc/uClibc-ng.sh +++ b/scripts/build/libc/uClibc-ng.sh @@ -34,7 +34,7 @@ uClibc_ng_backend_once() # Construct make arguments: # - uClibc uses the CROSS environment variable as a prefix to the compiler - # tools to use. Since it requires core pass-1, thusly named compiler is + # tools to use. Since it requires core compiler, thusly named compiler is # already available. # - Note about CFLAGS: In uClibc, CFLAGS are generated by Rules.mak, # depending on the configuration of the library. That is, they are tailored -- cgit v0.10.2-6-g49f6 From a4cff7a0612fccb0e32529a10e53a836fa12d634 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 9 Feb 2022 17:02:35 -0800 Subject: glibc-2.12.1: backport a fix for 2-pass build Otherwise, it tries to link against libgcc_eh which is not available until the final compiler (or previously, the pass-2 compiler) is built. Signed-off-by: Alexey Neyman diff --git a/packages/glibc-ports/2.12.1/0009-do-not-use-libgcc_eh.patch b/packages/glibc-ports/2.12.1/0009-do-not-use-libgcc_eh.patch new file mode 100644 index 0000000..dc746c4 --- /dev/null +++ b/packages/glibc-ports/2.12.1/0009-do-not-use-libgcc_eh.patch @@ -0,0 +1,31 @@ +commit 95f5a9a866695da4e038aa4e6ccbbfd5d9cf63b7 +Author: Joseph Myers +Date: Tue Jul 3 19:14:59 2012 +0000 + + Avoid use of libgcc_s and libgcc_eh when building glibc. + +--- + sysdeps/arm/eabi/Makefile | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/sysdeps/arm/eabi/Makefile ++++ b/sysdeps/arm/eabi/Makefile +@@ -1,3 +1,6 @@ ++gnulib-arch = $(elfobjdir)/libgcc-stubs.a ++static-gnulib-arch = $(elfobjdir)/libgcc-stubs.a ++ + ifeq ($(subdir),csu) + aeabi_constants = aeabi_lcsts aeabi_sighandlers aeabi_math + aeabi_routines = aeabi_assert aeabi_localeconv aeabi_errno_addr \ +@@ -24,6 +27,11 @@ + sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx + shared-only-routines += aeabi_unwind_cpp_pr1 + sysdep-rtld-routines += aeabi_unwind_cpp_pr1 ++ ++$(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os ++ $(build-extra-lib) ++ ++lib-noranlib: $(objpfx)libgcc-stubs.a + endif + + ifeq ($(subdir),math) diff --git a/packages/glibc/2.12.1/0050-do-not-use-libgcc_eh.patch b/packages/glibc/2.12.1/0050-do-not-use-libgcc_eh.patch new file mode 100644 index 0000000..08192b3 --- /dev/null +++ b/packages/glibc/2.12.1/0050-do-not-use-libgcc_eh.patch @@ -0,0 +1,292 @@ +commit 95f5a9a866695da4e038aa4e6ccbbfd5d9cf63b7 +Author: Joseph Myers +Date: Tue Jul 3 19:14:59 2012 +0000 + + Avoid use of libgcc_s and libgcc_eh when building glibc. + +--- + Makeconfig | 69 ++++++++++++++++++++++++++++++++++++++++++++++------- + Rules | 39 +++++++++++++++++++++++------ + elf/Makefile | 6 +++- + elf/static-stubs.c | 46 +++++++++++++++++++++++++++++++++++ + 4 files changed, 142 insertions(+), 18 deletions(-) + +--- a/Makeconfig ++++ b/Makeconfig +@@ -429,9 +429,9 @@ + LDFLAGS-rtld += $(hashstyle-LDFLAGS) + endif + +-# Command for linking programs with the C library. ++# Commands for linking programs with the C library. + ifndef +link +-+link = $(CC) -nostdlib -nostartfiles -o $@ \ +++link-before-libc = $(CC) -nostdlib -nostartfiles -o $@ \ + $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ + $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \ + $(addprefix $(csu-objpfx),$(start-installed-name)) \ +@@ -440,7 +440,10 @@ + $(start-installed-name))\ + $(+preinit) $(link-extra-libs) \ + $(common-objpfx)libc% $(+postinit),$^) \ +- $(link-extra-libs) $(link-libc) $(+postctor) $(+postinit) ++ $(link-extra-libs) +++link-after-libc = $(+postctor) $(+postinit) +++link = $(+link-before-libc) $(link-libc) $(+link-after-libc) +++link-tests = $(+link-before-libc) $(link-libc-tests) $(+link-after-libc) + endif + # Command for linking PIE programs with the C library. + ifndef +link-pie +@@ -457,7 +460,7 @@ + endif + # Command for statically linking programs with the C library. + ifndef +link-static +-+link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \ +++link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \ + $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ + $(addprefix $(csu-objpfx),$(static-start-installed-name)) \ + $(+preinit) $(+prector) \ +@@ -465,7 +468,12 @@ + $(start-installed-name))\ + $(+preinit) $(link-extra-libs-static) \ + $(common-objpfx)libc% $(+postinit),$^) \ +- $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) ++ $(link-extra-libs-static) $(link-libc-static) +++link-static-after-libc = $(+postctor) $(+postinit) +++link-static = $(+link-static-before-libc) $(link-libc-static) \ ++ $(+link-static-after-libc) +++link-static-tests = $(+link-static-before-libc) $(link-libc-static-tests) \ ++ $(+link-static-after-libc) + endif + # Command for statically linking bounded-pointer programs with the C library. + ifndef +link-bounded +@@ -490,10 +498,12 @@ + # We need the versioned name of libc.so in the deps of $(others) et al + # so that the symlink to libc.so is created before anything tries to + # run the linked programs. +-link-libc = -Wl,-rpath-link=$(rpath-link) \ ++link-libc-before-gnulib = -Wl,-rpath-link=$(rpath-link) \ + $(common-objpfx)libc.so$(libc.so-version) \ + $(common-objpfx)$(patsubst %,$(libtype.oS),c) \ +- $(as-needed) $(common-objpfx)elf/ld.so $(no-as-needed) $(gnulib) ++ $(as-needed) $(common-objpfx)elf/ld.so $(no-as-needed) ++link-libc = $(link-libc-before-gnulib) $(gnulib) ++link-libc-tests = $(link-libc-before-gnulib) $(gnulib-tests) + # This is how to find at build-time things that will be installed there. + rpath-dirs = math elf dlfcn nss nis rt resolv crypt + endif +@@ -504,6 +514,7 @@ + nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss) + resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv) + link-libc = $(common-objpfx)libc.a $(otherlibs) $(gnulib) $(common-objpfx)libc.a $(gnulib) ++link-libc-tests = $(common-objpfx)libc.a $(otherlibs) $(gnulib-tests) $(common-objpfx)libc.a $(gnulib-tests) + endif + endif + +@@ -532,14 +543,50 @@ + # The static libraries. + ifeq (yes,$(build-static)) + link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a ++link-libc-static-tests = $(common-objpfx)libc.a $(static-gnulib-tests) $(otherlibs) $(common-objpfx)libc.a + else + ifeq (yes,$(build-shared)) + # We can try to link the programs with lib*_pic.a... + link-libc-static = $(static-gnulib) $(common-objpfx)libc_pic.a ++link-libc-static-tests = $(static-gnulib-tests) $(common-objpfx)libc_pic.a + endif + endif + link-libc-bounded = $(common-objpfx)libc_b.a $(gnulib) $(common-objpfx)libc_b.a + ++# How to link against libgcc. Some libgcc functions, such as those ++# for "long long" arithmetic or software floating point, can always be ++# built without use of C library headers and do not have any global ++# state so can safely be linked statically into any executable or ++# shared library requiring them; these functions are in libgcc.a. ++# Other functions, relating to exception handling, may require C ++# library headers to build and it may not be safe to have more than ++# one copy of them in a process; these functions are only in ++# libgcc_s.so and libgcc_eh.a. ++# ++# To avoid circular dependencies when bootstrapping, it is desirable ++# to avoid use of libgcc_s and libgcc_eh in building glibc. Where any ++# glibc functionality (in particular, thread cancellation) requires ++# exception handling, this is implemented through dlopen of libgcc_s ++# to avoid unnecessary dependencies on libgcc_s by programs not using ++# that functionality; executables built with glibc do not use ++# exception handling other than through thread cancellation. ++# ++# Undefined references to functions from libgcc_eh or libgcc_s may ++# arise for code built with -fexceptions. In the case of statically ++# linked programs installed by glibc, unwinding will never actually ++# occur at runtime and the use of elf/static-stubs.c to resolve these ++# references is safe. In the case of statically linked test programs ++# and test programs built with -fexceptions, unwinding may occur in ++# some cases and it is preferable to link with libgcc_eh or libgcc_s ++# so that the testing is as similar as possible to how programs will ++# be built with the installed glibc. ++# ++# Some architectures have architecture-specific systems for exception ++# handling that may involve undefined references to ++# architecture-specific functions. On those architectures, ++# gnulib-arch and static-gnulib-arch may be defined in sysdeps ++# makefiles to use additional libraries for linking executables and ++# shared libraries built by glibc. + ifndef gnulib + ifneq ($(have-cc-with-libunwind),yes) + libunwind = +@@ -551,8 +598,12 @@ + else + libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed + endif +-gnulib := -lgcc $(libgcc_eh) +-static-gnulib := -lgcc -lgcc_eh $(libunwind) ++gnulib-arch = ++gnulib = -lgcc $(gnulib-arch) ++gnulib-tests := -lgcc $(libgcc_eh) ++static-gnulib-arch = ++static-gnulib = -lgcc $(static-gnulib-arch) ++static-gnulib-tests := -lgcc -lgcc_eh $(libunwind) + libc.so-gnulib := -lgcc + endif + ifeq ($(elf),yes) +--- a/Rules ++++ b/Rules +@@ -104,29 +104,52 @@ + endif + + ifeq ($(build-programs),yes) +-binaries-all = $(others) $(sysdep-others) $(tests) $(xtests) $(test-srcs) +-binaries-static = $(others-static) $(tests-static) $(xtests-static) ++binaries-all-notests = $(others) $(sysdep-others) ++binaries-all-tests = $(tests) $(xtests) $(test-srcs) ++binaries-all = $(binaries-all-notests) $(binaries-all-tests) ++binaries-static-notests = $(others-static) ++binaries-static-tests = $(tests-static) $(xtests-static) ++binaries-static = $(binaries-static-notests) $(binaries-static-tests) + else +-binaries-all = $(tests) $(xtests) $(test-srcs) ++binaries-all-notests = ++binaries-all-tests = $(tests) $(xtests) $(test-srcs) ++binaries-all = $(binaries-all-tests) ++binaries-static-notests = ++binaries-static-tests = + binaries-static = + endif + +-binaries-shared = $(filter-out $(binaries-static), $(binaries-all)) ++binaries-shared-tests = $(filter-out $(binaries-static), $(binaries-all-tests)) ++binaries-shared-notests = $(filter-out $(binaries-static), $(binaries-all-notests)) + +-ifneq "$(strip $(binaries-shared))" "" +-$(addprefix $(objpfx),$(binaries-shared)): %: %.o \ ++ifneq "$(strip $(binaries-shared-notests))" "" ++$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \ + $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \ + $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit) + $(+link) + endif + +-ifneq "$(strip $(binaries-static))" "" +-$(addprefix $(objpfx),$(binaries-static)): %: %.o \ ++ifneq "$(strip $(binaries-shared-tests))" "" ++$(addprefix $(objpfx),$(binaries-shared-tests)): %: %.o \ ++ $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \ ++ $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit) ++ $(+link-tests) ++endif ++ ++ifneq "$(strip $(binaries-static-notests))" "" ++$(addprefix $(objpfx),$(binaries-static-notests)): %: %.o \ + $(sort $(filter $(common-objpfx)lib%,$(link-libc-static))) \ + $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit) + $(+link-static) + endif + ++ifneq "$(strip $(binaries-static-tests))" "" ++$(addprefix $(objpfx),$(binaries-static-tests)): %: %.o \ ++ $(sort $(filter $(common-objpfx)lib%,$(link-libc-static-tests))) \ ++ $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit) ++ $(+link-static-tests) ++endif ++ + ifeq ($(build-bounded),yes) + binaries-bounded = $(addsuffix -bp,$(tests) $(xtests) $(test-srcs)) + $(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \ +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -157,6 +157,8 @@ + install-bin = sprof + others-static = sln + install-rootsbin = sln ++sln-modules := static-stubs ++extra-objs += $(sln-modules:=.o) + + ifeq (yes,$(use-ldconfig)) + ifeq (yes,$(build-shared)) +@@ -164,7 +166,7 @@ + others += ldconfig + install-rootsbin += ldconfig + +-ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon ++ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs + extra-objs += $(ldconfig-modules:=.o) + + # To find xmalloc.c and xstrdup.c +@@ -455,6 +457,8 @@ + + $(objpfx)sprof: $(libdl) + ++$(objpfx)sln: $(sln-modules:%=$(objpfx)%.o) ++ + $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) + SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' + CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +--- /dev/null ++++ b/elf/static-stubs.c +@@ -0,0 +1,46 @@ ++/* Stub implementations of functions to link into statically linked ++ programs without needing libgcc_eh. ++ Copyright (C) 2012 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++/* Avoid backtrace (and so _Unwind_Backtrace) dependencies from ++ sysdeps/unix/sysv/linux/libc_fatal.c. */ ++#include ++ ++#include ++#include ++ ++/* These programs do not use thread cancellation, so _Unwind_Resume ++ and the personality routine are never actually called. */ ++ ++void ++_Unwind_Resume (struct _Unwind_Exception *exc __attribute__ ((unused))) ++{ ++ abort (); ++} ++ ++_Unwind_Reason_Code ++__gcc_personality_v0 (int version __attribute__ ((unused)), ++ _Unwind_Action actions __attribute__ ((unused)), ++ _Unwind_Exception_Class exception_class ++ __attribute__ ((unused)), ++ struct _Unwind_Exception *ue_header ++ __attribute__ ((unused)), ++ struct _Unwind_Context *context __attribute__ ((unused))) ++{ ++ abort (); ++} -- cgit v0.10.2-6-g49f6 From 5411e69b9136702aa3f17572479e8e5f5d3758d6 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 10 Feb 2022 14:43:30 -0800 Subject: Update the docker containers To avoid proliferation of versions, I suggest the following policy: the oldest LTS release still receiving maintenance updates + the most recent release for distributions that offer LTS releases. For CentOS, this means CentOS7 and CentOS Stream 9 (since CentOS are all "long-term support", this is just the oldest and the newest among currently supported). For Ubuntu, this means Ubuntu 18.04 (previous LTS are in "security fixes only" mode) and Ubuntu 21.10. Recent Ubuntu attempts to be interactive during the configuration of tzdata, required some additional setup. In the common installation script, the logic for handling a configured/built local directory breaks if `gmake` is detected as the make binary; `make distclean` then fails inside the container because not all systems have `gmake` symlink. Remove that attempt of a workaround completely, just require that the host directory is clean. Signed-off-by: Alexey Neyman diff --git a/testing/docker/alpine3.15/Dockerfile b/testing/docker/alpine3.15/Dockerfile new file mode 100644 index 0000000..2315e78 --- /dev/null +++ b/testing/docker/alpine3.15/Dockerfile @@ -0,0 +1,14 @@ +FROM alpine:3.15 +ARG CTNG_UID=1000 +ARG CTNG_GID=1000 +RUN addgroup -g $CTNG_GID ctng +RUN adduser -D -h /home/ctng -G ctng -u $CTNG_UID -s /bin/bash ctng +# Activate community and testing repositories +RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories +RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories +RUN apk update +RUN apk add alpine-sdk wget xz git bash autoconf automake bison flex texinfo help2man gawk libtool ncurses-dev gettext-dev python3-dev rsync +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 +RUN chmod a+x /sbin/dumb-init +RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile +ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/alpine3.15/EXPERIMENTAL b/testing/docker/alpine3.15/EXPERIMENTAL new file mode 100644 index 0000000..846c43b --- /dev/null +++ b/testing/docker/alpine3.15/EXPERIMENTAL @@ -0,0 +1,11 @@ +Support for Alpine Linux as a build or host platform is EXPERIMENTAL. Some of +the packages try to compile binaries for the build or the host machine and fail +because they expect certain GLIBC-specific types, etc: Alpine Linux does not +use GNU libc, it uses musl. + +Only the following bug reports will be looked into: +- A sample configuration used to build successfully and no longer does. Identify +the commit ID that builds successfully for you. +- A pull request that fixes the build for any sample on the Alpine Linux. + +All other bug reports against Alpine as a build/host will be summarily closed. diff --git a/testing/docker/alpine3.8/Dockerfile b/testing/docker/alpine3.8/Dockerfile deleted file mode 100644 index 6119f36..0000000 --- a/testing/docker/alpine3.8/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM alpine:3.8 -ARG CTNG_UID=1000 -ARG CTNG_GID=1000 -RUN addgroup -g $CTNG_GID ctng -RUN adduser -D -h /home/ctng -G ctng -u $CTNG_UID -s /bin/bash ctng -# Activate community and testing repositories -RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories -RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories -RUN apk update -RUN apk add alpine-sdk wget xz git bash autoconf automake bison flex texinfo help2man gawk libtool ncurses-dev gettext-dev python-dev rsync -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 -RUN chmod a+x /sbin/dumb-init -RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/alpine3.8/EXPERIMENTAL b/testing/docker/alpine3.8/EXPERIMENTAL deleted file mode 100644 index 4d4d6d7..0000000 --- a/testing/docker/alpine3.8/EXPERIMENTAL +++ /dev/null @@ -1,11 +0,0 @@ -Support for Alpine Linux as a build or host platform is EXPERIMENTAL. Some of -the packages try to compile binaries for the build or the machine and fail -because they expect certain GLIBC-specific types, etc: Alpine Linux does not -use GNU libc, it uses musl. - -Only the following bug reports will be looked into: -- A sample configuration used to build successfully and no longer does. Identify -the commit ID that builds successfully for you. -- A pull request that fixes the build for any sample on the Alpine Linux. - -All other bug reports against Alpine as a build/host will be summarily closed. diff --git a/testing/docker/archlinux/Dockerfile b/testing/docker/archlinux/Dockerfile index 95b80f1..571f72d 100644 --- a/testing/docker/archlinux/Dockerfile +++ b/testing/docker/archlinux/Dockerfile @@ -6,7 +6,7 @@ RUN pacman -Syu --noconfirm RUN pacman -S --noconfirm base-devel git help2man python unzip wget audit rsync RUN groupadd -g $CTNG_GID ctng RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 RUN chmod a+x /sbin/dumb-init RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile RUN echo 'export MENUCONFIG_COLOR=mono' >> /etc/profile diff --git a/testing/docker/centos-stream9/Dockerfile b/testing/docker/centos-stream9/Dockerfile new file mode 100644 index 0000000..2e6babc --- /dev/null +++ b/testing/docker/centos-stream9/Dockerfile @@ -0,0 +1,11 @@ +FROM quay.io/centos/centos:stream9 +ARG CTNG_UID=1000 +ARG CTNG_GID=1000 +RUN groupadd -g $CTNG_GID ctng +RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng +RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \ + ncurses-devel python3-devel perl-Thread-Queue bzip2 git wget which xz unzip rsync diffutils +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 +RUN chmod a+x /sbin/dumb-init +RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile +ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/centos6/Dockerfile b/testing/docker/centos6/Dockerfile deleted file mode 100644 index 736557b..0000000 --- a/testing/docker/centos6/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM centos:6 -ARG CTNG_UID=1000 -ARG CTNG_GID=1000 -RUN groupadd -g $CTNG_GID ctng -RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng -RUN yum install -y epel-release -RUN yum install -y autoconf gperf bison flex texinfo help2man gcc-c++ libtool libtool-bin patch \ - ncurses-devel python34-devel perl-Thread-Queue bzip2 git wget xz unzip rsync -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 -RUN chmod a+x /sbin/dumb-init -RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -# The limits in this file prevent su'ing to ctng user -RUN rm -f /etc/security/limits.d/90-nproc.conf -ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/centos7/Dockerfile b/testing/docker/centos7/Dockerfile index 7dfe173..a595bb4 100644 --- a/testing/docker/centos7/Dockerfile +++ b/testing/docker/centos7/Dockerfile @@ -7,7 +7,7 @@ RUN yum install -y epel-release RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \ ncurses-devel python36-devel perl-Thread-Queue bzip2 git wget which xz unzip rsync RUN ln -sf python36 /usr/bin/python3 -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 RUN chmod a+x /sbin/dumb-init RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/common-scripts/ctng-install b/testing/docker/common-scripts/ctng-install index 1efd264..1b635d9 100755 --- a/testing/docker/common-scripts/ctng-install +++ b/testing/docker/common-scripts/ctng-install @@ -1,23 +1,25 @@ #!/bin/bash set -e -# Mounted directory may already be configured - or may not -# even had bootstrapped. +# Mounted directory may already be configured. Trying to install from +# such directory would cause a failure in the container due to mismatch in +# command names/paths detected by configure on the host. +if [ -e /crosstool-ng/Makefile \ + -o -e /crosstool-ng/.build \ + -o -e /crosstool-ng/.build-all \ + -o -e /crosstool-ng/config.status ]; then + echo "ERROR :: The host directory must not be configured/built. Run 'git clean -fxd' before" >&2 + echo "ERROR :: installing crosstool-NG in the container." >&2 + exit 1 +fi tar cf - -C / \ - --exclude=crosstool-ng/.build \ - --exclude=crosstool-ng/.build.all \ --exclude=crosstool-ng/.git \ --exclude=crosstool-ng/testing/docker \ crosstool-ng | \ tar xf - cd crosstool-ng -if [ -r Makefile ]; then - make distclean -elif [ ! -r configure ]; then - ./bootstrap -fi -cd .. -cd work +./bootstrap +cd ../work ~/crosstool-ng/configure --prefix=/opt/ctng make make install diff --git a/testing/docker/dmgr.sh b/testing/docker/dmgr.sh index e6a93e7..2945fbb 100755 --- a/testing/docker/dmgr.sh +++ b/testing/docker/dmgr.sh @@ -37,6 +37,8 @@ Action is one of: enter Spawn a shell in the specified container. root Spawn a root shell in the specified container. clean Clean up in the specified container. + distclean Same as clean but also remove installed versions of + Crosstool-NG and the previously built toolchains. If a special container name 'all' is used, the action is performed on all the containers. @@ -63,7 +65,7 @@ action_build() msg "Cleaning up previous runs for ${cntr}" do_cleanup ${cntr}/{build,install,xtools} msg "Building Docker container for ${cntr}" -set -x + set -x docker build --no-cache -t "ctng-${cntr}" --build-arg CTNG_GID=`id -g` --build-arg CTNG_UID=`id -u` "${cntr}" } @@ -92,8 +94,9 @@ _dckr() $prefix su -l ctng fi if [ $? != 0 ]; then - global_rc=1 + global_rc=1 fi + return $global_rc } # Run the test @@ -105,9 +108,9 @@ action_install() msg "Setting up crosstool-NG in ${cntr}" do_cleanup ${cntr}/build if ! _dckr "${cntr}" /common-scripts/ctng-install; then - warn "Installation failed" + warn "Installation failed" elif ! _dckr "${cntr}" /common-scripts/ctng-test-basic; then - warn "Basic tests failed" + warn "Basic tests failed" fi } diff --git a/testing/docker/fedora29/Dockerfile b/testing/docker/fedora29/Dockerfile deleted file mode 100644 index 9d7293f..0000000 --- a/testing/docker/fedora29/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM fedora:29 -ARG CTNG_UID=1000 -ARG CTNG_GID=1000 -RUN groupadd -g $CTNG_GID ctng -RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng -RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \ - ncurses-devel python3-devel perl-Thread-Queue bzip2 git wget which xz unzip rsync -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 -RUN chmod a+x /sbin/dumb-init -RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/fedora35/Dockerfile b/testing/docker/fedora35/Dockerfile new file mode 100644 index 0000000..1ce88f7 --- /dev/null +++ b/testing/docker/fedora35/Dockerfile @@ -0,0 +1,11 @@ +FROM fedora:35 +ARG CTNG_UID=1000 +ARG CTNG_GID=1000 +RUN groupadd -g $CTNG_GID ctng +RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng +RUN yum install -y autoconf gperf bison file flex texinfo help2man gcc-c++ libtool make patch \ + ncurses-devel python3-devel perl-Thread-Queue bzip2 git wget which xz unzip rsync diffutils +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 +RUN chmod a+x /sbin/dumb-init +RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile +ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/gentoo-amd64/Dockerfile b/testing/docker/gentoo-amd64/Dockerfile index b261cc3..b090c47 100644 --- a/testing/docker/gentoo-amd64/Dockerfile +++ b/testing/docker/gentoo-amd64/Dockerfile @@ -3,7 +3,7 @@ ARG CTNG_UID=1000 ARG CTNG_GID=1000 RUN groupadd -g $CTNG_GID ctng RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 RUN chmod a+x /sbin/dumb-init RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/mint19-amd64/Dockerfile b/testing/docker/mint19-amd64/Dockerfile deleted file mode 100644 index 61f0562..0000000 --- a/testing/docker/mint19-amd64/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM linuxmintd/mint19-amd64 -ARG CTNG_UID=1000 -ARG CTNG_GID=1000 -RUN groupadd -g $CTNG_GID ctng -RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng -RUN apt-get update -RUN apt-get install -y gcc gperf bison flex texinfo help2man make libncurses5-dev \ - python3-dev autoconf automake libtool libtool-bin gawk wget rsync -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 -RUN chmod a+x /sbin/dumb-init -RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/mint20-amd64/Dockerfile b/testing/docker/mint20-amd64/Dockerfile new file mode 100644 index 0000000..be2ea45 --- /dev/null +++ b/testing/docker/mint20-amd64/Dockerfile @@ -0,0 +1,12 @@ +FROM linuxmintd/mint20-amd64 +ARG CTNG_UID=1000 +ARG CTNG_GID=1000 +RUN groupadd -g $CTNG_GID ctng +RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng +RUN apt-get update +RUN apt-get install -y gcc gperf bison flex texinfo help2man make libncurses5-dev \ + python3-dev autoconf automake libtool libtool-bin gawk wget rsync +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 +RUN chmod a+x /sbin/dumb-init +RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile +ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/ubuntu16.04/Dockerfile b/testing/docker/ubuntu16.04/Dockerfile deleted file mode 100644 index 4190fc5..0000000 --- a/testing/docker/ubuntu16.04/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM ubuntu:16.04 -ARG CTNG_UID=1000 -ARG CTNG_GID=1000 -RUN groupadd -g $CTNG_GID ctng -RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng -RUN apt-get update -RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \ - python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \ - patch libstdc++6 rsync -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 -RUN chmod a+x /sbin/dumb-init -RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -ENTRYPOINT [ "/sbin/dumb-init", "--" ] - diff --git a/testing/docker/ubuntu18.04/Dockerfile b/testing/docker/ubuntu18.04/Dockerfile index f5156d2..8adc186 100644 --- a/testing/docker/ubuntu18.04/Dockerfile +++ b/testing/docker/ubuntu18.04/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \ python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \ patch libstdc++6 rsync -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 RUN chmod a+x /sbin/dumb-init RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile ENTRYPOINT [ "/sbin/dumb-init", "--" ] diff --git a/testing/docker/ubuntu19.10/Dockerfile b/testing/docker/ubuntu19.10/Dockerfile deleted file mode 100644 index 0c39ffc..0000000 --- a/testing/docker/ubuntu19.10/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM ubuntu:19.10 -ARG CTNG_UID=1000 -ARG CTNG_GID=1000 -RUN groupadd -g $CTNG_GID ctng -RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng -RUN apt-get update -RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \ - python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \ - patch libstdc++6 rsync git -RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_amd64 -RUN chmod a+x /sbin/dumb-init -RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile -ENTRYPOINT [ "/sbin/dumb-init", "--" ] - diff --git a/testing/docker/ubuntu21.10/Dockerfile b/testing/docker/ubuntu21.10/Dockerfile new file mode 100644 index 0000000..883a26d --- /dev/null +++ b/testing/docker/ubuntu21.10/Dockerfile @@ -0,0 +1,20 @@ +FROM ubuntu:21.10 +ARG CTNG_UID=1000 +ARG CTNG_GID=1000 +RUN groupadd -g $CTNG_GID ctng +RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng + +# Non-interactive configuration of tzdata +ENV DEBIAN_FRONTEND noninteractive +ENV DEBCONF_NONINTERACTIVE_SEEN true +RUN { echo 'tzdata tzdata/Areas select Etc'; echo 'tzdata tzdata/Zones/Etc select UTC'; } | debconf-set-selections + +RUN apt-get update +RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \ + python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \ + patch libstdc++6 rsync git +RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 +RUN chmod a+x /sbin/dumb-init +RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile +ENTRYPOINT [ "/sbin/dumb-init", "--" ] + -- cgit v0.10.2-6-g49f6 From 1210b0c2f45e32ef0867ca00e16b6aadb6a81bf9 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 10 Feb 2022 14:57:34 -0800 Subject: Run packages through `manage-packages -D` This fixed some typos in the checksum files (please don't edit them manually, this is error-prone!) Signed-off-by: Alexey Neyman diff --git a/packages/autoconf/2.71/chksum b/packages/autoconf/2.71/chksum index b7ce57d..cd09e72 100644 --- a/packages/autoconf/2.71/chksum +++ b/packages/autoconf/2.71/chksum @@ -1,8 +1,8 @@ -md5sum autoconf-2.71.tar.xz 12cfa1687ffa2606337efe1a64416106 -sha1sum autoconf-2.71.tar.xz 1b5b1dbed849c6653be47c56d28d26fcf3f7238a -sha256sum autoconf-2.71.tar.xz f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 -sha512sum autoconf-2.71.tar.xz 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0 -md5sum autoconf-2.71.tar.gz f64e38d671fdec06077a41eb4d5ee476 -sha1sum autoconf-2.71.tar.gz abe5a4bcf06ebd1bbbf81007159df346f5c1db8b -sha256sum autoconf-2.71.tar.gz 431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c -sha512sum autoconf-2.71.tar.gz 2bc5331f9807da8754b2ee623a30299cc0d103d6f98068a4c22263aab67ff148b7ad3a1646bd274e604bc08a8ef0ac2601e6422e641ad0cfab2222d60a58c5a8 +md5 autoconf-2.71.tar.xz 12cfa1687ffa2606337efe1a64416106 +sha1 autoconf-2.71.tar.xz 1b5b1dbed849c6653be47c56d28d26fcf3f7238a +sha256 autoconf-2.71.tar.xz f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 +sha512 autoconf-2.71.tar.xz 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0 +md5 autoconf-2.71.tar.gz f64e38d671fdec06077a41eb4d5ee476 +sha1 autoconf-2.71.tar.gz abe5a4bcf06ebd1bbbf81007159df346f5c1db8b +sha256 autoconf-2.71.tar.gz 431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c +sha512 autoconf-2.71.tar.gz 2bc5331f9807da8754b2ee623a30299cc0d103d6f98068a4c22263aab67ff148b7ad3a1646bd274e604bc08a8ef0ac2601e6422e641ad0cfab2222d60a58c5a8 diff --git a/packages/binutils/2.35.1/chksum b/packages/binutils/2.35.1/chksum index 529d3b5..33cc7ef 100644 --- a/packages/binutils/2.35.1/chksum +++ b/packages/binutils/2.35.1/chksum @@ -1,3 +1,7 @@ +md5 binutils-2.35.1.tar.xz 7126f370ffbd46c08fcc5ce7aee2805d +sha1 binutils-2.35.1.tar.xz 45f7a96a2580a422f44b78317f0abf13935fecb6 +sha256 binutils-2.35.1.tar.xz 3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607 +sha512 binutils-2.35.1.tar.xz 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb md5 binutils-2.35.1.tar.bz2 9203e5ca6243c8501f679dd6407df820 sha1 binutils-2.35.1.tar.bz2 df4eb943bf65df4bbbd0a001efcc98113423c5dd sha256 binutils-2.35.1.tar.bz2 320e7a1d0f46fcd9f413f1046e216cbe23bb2bce6deb6c6a63304425e48b1942 @@ -6,7 +10,3 @@ md5 binutils-2.35.1.tar.gz bca600eea3b8fc33ad3265c9c1eee8d4 sha1 binutils-2.35.1.tar.gz 4f217d0e8f59a49817855260a3edf8202d307514 sha256 binutils-2.35.1.tar.gz a8dfaae8cbbbc260fc1737a326adca97b5d4f3c95a82f0af1f7455ed1da5e77b sha512 binutils-2.35.1.tar.gz ef5d84b8d9568615aed00ac661267c5eccfcb805a3643f94a2f8220d0c4dd1c6001c8d95a3507599b8cd0e87b15b1e320500ca34580927fb813209ad98a34b16 -md5 binutils-2.35.1.tar.xz 7126f370ffbd46c08fcc5ce7aee2805d -sha1 binutils-2.35.1.tar.xz 45f7a96a2580a422f44b78317f0abf13935fecb6 -sha256 binutils-2.35.1.tar.xz 3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607 -sha512 binutils-2.35.1.tar.xz 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb diff --git a/packages/binutils/2.36.1/chksum b/packages/binutils/2.36.1/chksum index e14c16b..652c371 100644 --- a/packages/binutils/2.36.1/chksum +++ b/packages/binutils/2.36.1/chksum @@ -1,3 +1,7 @@ +md5 binutils-2.36.1.tar.xz 628d490d976d8957279bbbff06cf29d4 +sha1 binutils-2.36.1.tar.xz 021c97cc0e751e989afb8db025fbd2ae48391831 +sha256 binutils-2.36.1.tar.xz e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0 +sha512 binutils-2.36.1.tar.xz cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 md5 binutils-2.36.1.tar.bz2 11be4c0a31ed4208c4da0917e1ea5668 sha1 binutils-2.36.1.tar.bz2 968cddc17354142ab7d60b93d7f169ec8373a9f4 sha256 binutils-2.36.1.tar.bz2 5b4bd2e79e30ce8db0abd76dd2c2eae14a94ce212cfc59d3c37d23e24bc6d7a3 @@ -6,7 +10,3 @@ md5 binutils-2.36.1.tar.gz 3df9c3bbd944f9b57c1496f06741197b sha1 binutils-2.36.1.tar.gz 71387d2287a591fc586e6a15055fec8536723490 sha256 binutils-2.36.1.tar.gz e68edeaaeb6ca9687b6dcbaedd1b376506baad2d48de26a885fc5ab6acb839da sha512 binutils-2.36.1.tar.gz 741a5a1499e25089d51721a5801fe3f48c789f9eb6831fb2427a1ef1d0c9d1ed411b87ddd247d9c7f0eb5afb8d9ed665dc993a7c42b7fd03a0a18a431fa80c00 -md5 binutils-2.36.1.tar.xz 628d490d976d8957279bbbff06cf29d4 -sha1 binutils-2.36.1.tar.xz 021c97cc0e751e989afb8db025fbd2ae48391831 -sha256 binutils-2.36.1.tar.xz e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0 -sha512 binutils-2.36.1.tar.xz cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 diff --git a/packages/gcc/11.2.0/chksum b/packages/gcc/11.2.0/chksum index dcc5d1c..36a02f8 100644 --- a/packages/gcc/11.2.0/chksum +++ b/packages/gcc/11.2.0/chksum @@ -1,8 +1,8 @@ -md5 gcc-11.2.0.tar.gz dc6886bd44bb49e2d3d662aed9729278 -sha1 gcc-11.2.0.tar.gz 4d631f343fc3bca2097dbb115f3cb42309a09e22 -sha256 gcc-11.2.0.tar.gz f0837f1bf8244a5cc23bd96ff6366712a791cfae01df8e25b137698aca26efc1 -sha512 gcc-11.2.0.tar.gz 78318318bc2f19dfa9e0e23ffd132758b11785422761eeb7f5c2988cdd0560860d4580142496faa211ba80414bae9b7f3bc55ea968bdd5c1f713d4c5266e2fa3 md5 gcc-11.2.0.tar.xz 31c86f2ced76acac66992eeedce2fce2 sha1 gcc-11.2.0.tar.xz f902ccacecf8949978d6261e9f1d034cff73ffdb sha256 gcc-11.2.0.tar.xz d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b sha512 gcc-11.2.0.tar.xz d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf +md5 gcc-11.2.0.tar.gz dc6886bd44bb49e2d3d662aed9729278 +sha1 gcc-11.2.0.tar.gz 4d631f343fc3bca2097dbb115f3cb42309a09e22 +sha256 gcc-11.2.0.tar.gz f0837f1bf8244a5cc23bd96ff6366712a791cfae01df8e25b137698aca26efc1 +sha512 gcc-11.2.0.tar.gz 78318318bc2f19dfa9e0e23ffd132758b11785422761eeb7f5c2988cdd0560860d4580142496faa211ba80414bae9b7f3bc55ea968bdd5c1f713d4c5266e2fa3 diff --git a/packages/gdb/11.2/chksum b/packages/gdb/11.2/chksum index ec620f8..8dda654 100644 --- a/packages/gdb/11.2/chksum +++ b/packages/gdb/11.2/chksum @@ -1,8 +1,8 @@ -md5 gdb-11.2.tar.gz b5674bef1fbd6beead889f80afa6f269 -sha1 gdb-11.2.tar.gz 4b80f1006730e45930956aca7e85c41c8ad09922 -sha256 gdb-11.2.tar.gz b558b66084835e43b6361f60d60d314c487447419cdf53adf83a87020c367290 -sha512 gdb-11.2.tar.gz e1fdcc8207fb479ff761bfb75fbb380757495e8e74b51b593acf425ffad80ee205692775111bdc9ba8f50a38e53deb156bb0d377078607c3d15afa46e8c30913 md5 gdb-11.2.tar.xz 433bd0904caa31c247b1b1867f2f911d sha1 gdb-11.2.tar.xz 7c72b1d4a38bb6e155aaad29f4c1abf818b4595d sha256 gdb-11.2.tar.xz 1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32 sha512 gdb-11.2.tar.xz 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 +md5 gdb-11.2.tar.gz b5674bef1fbd6beead889f80afa6f269 +sha1 gdb-11.2.tar.gz 4b80f1006730e45930956aca7e85c41c8ad09922 +sha256 gdb-11.2.tar.gz b558b66084835e43b6361f60d60d314c487447419cdf53adf83a87020c367290 +sha512 gdb-11.2.tar.gz e1fdcc8207fb479ff761bfb75fbb380757495e8e74b51b593acf425ffad80ee205692775111bdc9ba8f50a38e53deb156bb0d377078607c3d15afa46e8c30913 diff --git a/packages/glibc/2.33/chksum b/packages/glibc/2.33/chksum index 5f6a175..ba68a74 100644 --- a/packages/glibc/2.33/chksum +++ b/packages/glibc/2.33/chksum @@ -1,3 +1,7 @@ +md5 glibc-2.33.tar.xz 390bbd889c7e8e8a7041564cb6b27cca +sha1 glibc-2.33.tar.xz c33953a648e5f6373211cc9f6d9b9647d862aa45 +sha256 glibc-2.33.tar.xz 2e2556000e105dbd57f0b6b2a32ff2cf173bde4f0d85dffccfd8b7e51a0677ff +sha512 glibc-2.33.tar.xz 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb md5 glibc-2.33.tar.bz2 cbdfe3c6f8b247c20ebc5531627cb5d5 sha1 glibc-2.33.tar.bz2 065a09a1c7002faa270e448924e2c60c22f2c278 sha256 glibc-2.33.tar.bz2 4d7aa859d9152a4b243821eb604c0f1fee14c10d6341c2b9628d454cddd0f22e @@ -6,7 +10,3 @@ md5 glibc-2.33.tar.gz d1997e00b90cda2f901c5ba53eb955dc sha1 glibc-2.33.tar.gz 45c8207a1b5e462e6a148abc37ebdd0e86d2219d sha256 glibc-2.33.tar.gz ad7dbed6b0cde9ddc90e84856da7e2c1f976a5e791cdee947d8dbb0392fc76cf sha512 glibc-2.33.tar.gz 3c2e977dbf39eed09da8a56f20b6e60df26d1d203a770e8d1428f0c416a8a8bb1ac1e299233b4f3421dccac46d14fc753e5202411175448b99613f1be84f6b69 -md5 glibc-2.33.tar.xz 390bbd889c7e8e8a7041564cb6b27cca -sha1 glibc-2.33.tar.xz c33953a648e5f6373211cc9f6d9b9647d862aa45 -sha256 glibc-2.33.tar.xz 2e2556000e105dbd57f0b6b2a32ff2cf173bde4f0d85dffccfd8b7e51a0677ff -sha512 glibc-2.33.tar.xz 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb diff --git a/packages/glibc/2.34/chksum b/packages/glibc/2.34/chksum index eb7cef6..c8e49f4 100644 --- a/packages/glibc/2.34/chksum +++ b/packages/glibc/2.34/chksum @@ -1,3 +1,7 @@ +md5 glibc-2.34.tar.xz 31998b53fb39cb946e96abc310af1c89 +sha1 glibc-2.34.tar.xz 7c3b8890a6346793b6334cc5f2fea5d437d307b8 +sha256 glibc-2.34.tar.xz 44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2 +sha512 glibc-2.34.tar.xz 15252affd9ef4523a8001db16d497f4fdcb3ddf4cde7fe80e075df0bd3cc6524dc29fbe20229dbf5f97af580556e6b1fac0de321a5fe25322bc3e72f93beb624 md5 glibc-2.34.tar.bz2 bf41ec8a4bc2a039beca97a9408f754b sha1 glibc-2.34.tar.bz2 2aa649e08c12f40061152f2f30a64eb83d91b496 sha256 glibc-2.34.tar.bz2 4e64bbd9a861911a9816c3738c33603daff162fcb8a71f9750bf6cf3ac1201a1 @@ -6,7 +10,3 @@ md5 glibc-2.34.tar.gz 70696b3f0995ed0e06fc82ea32afe83c sha1 glibc-2.34.tar.gz 171cc6552cd8d05931b53b34ffbd26bce3fc4055 sha256 glibc-2.34.tar.gz 255b7632746b5fdd478cb7b36bebd1ec1f92c2b552ee364c940f48eb38d07f62 sha512 glibc-2.34.tar.gz f69541514cf1fd6b2bafb6585bef477142c491ad29c36dc0b38d20c0e09e33caa5a11a28aab4244b4c6fb6d1b5d1ac92c2b2ab777ba73b43aefbf695ad66f725 -md5 glibc-2.34.tar.xz 31998b53fb39cb946e96abc310af1c89 -sha1 glibc-2.34.tar.xz 7c3b8890a6346793b6334cc5f2fea5d437d307b8 -sha256 glibc-2.34.tar.xz 44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2 -sha512 glibc-2.34.tar.xz 15252affd9ef4523a8001db16d497f4fdcb3ddf4cde7fe80e075df0bd3cc6524dc29fbe20229dbf5f97af580556e6b1fac0de321a5fe25322bc3e72f93beb624 diff --git a/packages/glibc/2.35/chksum b/packages/glibc/2.35/chksum index 912eb0f..5c296ad 100644 --- a/packages/glibc/2.35/chksum +++ b/packages/glibc/2.35/chksum @@ -1,3 +1,7 @@ +md5 glibc-2.35.tar.xz dd571c67d85d89d7f60b854a4e207423 +sha1 glibc-2.35.tar.xz 7e2d857e427780a50133447f34dd84ab40fa4069 +sha256 glibc-2.35.tar.xz 5123732f6b67ccd319305efd399971d58592122bcc2a6518a1bd2510dd0cf52e +sha512 glibc-2.35.tar.xz e7336ce27561be5d7c217832a1136fb327e057bd8d3f92925b35c97e3e9f9e486948b5a1e03e5e4090772ef06437a074d10b82e68f17f1ad8f22077ee39e1b66 md5 glibc-2.35.tar.bz2 057173a3db5b68e281996f3bee51f221 sha1 glibc-2.35.tar.bz2 b6136f132c31e6f37097da3118caad905e494d77 sha256 glibc-2.35.tar.bz2 d350dda6cbd14b33ee6b9741e2c649b746c7fe64b623b7703bdda232ff3e90dc @@ -6,7 +10,3 @@ md5 glibc-2.35.tar.gz 3c80dbf55ddeeab19eb9b93c67ebff01 sha1 glibc-2.35.tar.gz 8429412cd99c8a179b0d82d982c69ce5a7cb18ba sha256 glibc-2.35.tar.gz 3e8e0c6195da8dfbd31d77c56fb8d99576fb855fafd47a9e0a895e51fd5942d4 sha512 glibc-2.35.tar.gz 45bf782aeda508e17fd51b45cf5ad96bd1067cf96b758b5c2d5def681af713df15e75c253d9c85de047f0a1dd22cf4f2239d70ae392cdb9291092e6570734d43 -md5 glibc-2.35.tar.xz dd571c67d85d89d7f60b854a4e207423 -sha1 glibc-2.35.tar.xz 7e2d857e427780a50133447f34dd84ab40fa4069 -sha256 glibc-2.35.tar.xz 5123732f6b67ccd319305efd399971d58592122bcc2a6518a1bd2510dd0cf52e -sha512 glibc-2.35.tar.xz e7336ce27561be5d7c217832a1136fb327e057bd8d3f92925b35c97e3e9f9e486948b5a1e03e5e4090772ef06437a074d10b82e68f17f1ad8f22077ee39e1b66 diff --git a/packages/gmp/6.2.1/chksum b/packages/gmp/6.2.1/chksum index 259a4b0..45e6207 100644 --- a/packages/gmp/6.2.1/chksum +++ b/packages/gmp/6.2.1/chksum @@ -6,3 +6,7 @@ md5 gmp-6.2.1.tar.lz 03a31d8cbaf29d136252f8f38875ed82 sha1 gmp-6.2.1.tar.lz a035e45cb4fdb192074a46c6dd4dbe16ce3cf2a9 sha256 gmp-6.2.1.tar.lz 2c7f4f0d370801b2849c48c9ef3f59553b5f1d3791d070cffb04599f9fc67b41 sha512 gmp-6.2.1.tar.lz 40e1c80d1a2eda0ea190ba2a27e7bfe718ee1fc685082b4f2251f108ffbec94272199b35cf6df217c9f6f10ac4132eaf3c5014a9e25db0592b94f7f1ddd4994f +md5 gmp-6.2.1.tar.bz2 28971fc21cf028042d4897f02fd355ea +sha1 gmp-6.2.1.tar.bz2 2dcf34d4a432dbe6cce1475a835d20fe44f75822 +sha256 gmp-6.2.1.tar.bz2 eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c +sha512 gmp-6.2.1.tar.bz2 8904334a3bcc5c896ececabc75cda9dec642e401fb5397c4992c4fabea5e962c9ce8bd44e8e4233c34e55c8010cc28db0545f5f750cbdbb5f00af538dc763be9 diff --git a/packages/isl/0.24/chksum b/packages/isl/0.24/chksum index 1ff3f60..acc43d8 100644 --- a/packages/isl/0.24/chksum +++ b/packages/isl/0.24/chksum @@ -2,12 +2,10 @@ md5 isl-0.24.tar.xz fae030f604a9537adc2502990a8ab4d1 sha1 isl-0.24.tar.xz d16012cf5bf35684ef0de68dab55279d34df4909 sha256 isl-0.24.tar.xz 043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad sha512 isl-0.24.tar.xz ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8 - md5 isl-0.24.tar.bz2 dd2f7b78e118c25bd96134a52aae7f4d sha1 isl-0.24.tar.bz2 ae5fbb33bcb442121fbbf482a93f6b3c84d489ee sha256 isl-0.24.tar.bz2 fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0 sha512 isl-0.24.tar.bz2 aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95 - md5 isl-0.24.tar.gz fe4c1c0540a2bbad8c0b5d574f460d4d sha1 isl-0.24.tar.gz b0c46cc1c4fb1658def8d3c4c702a01049ea795e sha256 isl-0.24.tar.gz 26e6e4d60ad59b3fff9948eb36743f0c874e124e410ef5bab930d0f546bc580d diff --git a/packages/linux/3.16.85/chksum b/packages/linux/3.16.85/chksum index 98b714e..852d4d7 100644 --- a/packages/linux/3.16.85/chksum +++ b/packages/linux/3.16.85/chksum @@ -1,8 +1,8 @@ -md5 linux-3.16.85.tar.gz a9651798575834dc85ae16a4b3d3d037 -sha1 linux-3.16.85.tar.gz cea65253d8adce0f1ac67c20b6f185acf5dd3b9f -sha256 linux-3.16.85.tar.gz fde0ce19a3a5abdd057dd338d0aa045cc38d420d1f7557407327c7481228fd5b -sha512 linux-3.16.85.tar.gz e51d98363cec07a4c44656761da61d2bca0f77cdc75dbe021532f795bf1e3cdefb19f77c0f4f7b2b5cb2bd8a07944266d40fb8f32b3f1039ff31dfcda99a1623 md5 linux-3.16.85.tar.xz 419c43db2a00f55fbd3f70b4f6af4a85 sha1 linux-3.16.85.tar.xz 489ecaf13c2d6b706ed8e80b2c154397fb1fca72 sha256 linux-3.16.85.tar.xz 80b1598d389c94e83fdf15d99c7da452aeb3093fbf8ed7c91584c06c09fc1fa6 sha512 linux-3.16.85.tar.xz ba4012ae19bf25e947d61c9b978e4c440e5ffd0fb723dfbda6eaa90b4f5806c673da17ce5f8f16a928910c9c5b9294324f5a8e08fb67bbba163b8cd03ab2c78e +md5 linux-3.16.85.tar.gz a9651798575834dc85ae16a4b3d3d037 +sha1 linux-3.16.85.tar.gz cea65253d8adce0f1ac67c20b6f185acf5dd3b9f +sha256 linux-3.16.85.tar.gz fde0ce19a3a5abdd057dd338d0aa045cc38d420d1f7557407327c7481228fd5b +sha512 linux-3.16.85.tar.gz e51d98363cec07a4c44656761da61d2bca0f77cdc75dbe021532f795bf1e3cdefb19f77c0f4f7b2b5cb2bd8a07944266d40fb8f32b3f1039ff31dfcda99a1623 diff --git a/packages/linux/5.11.21/chksum b/packages/linux/5.11.21/chksum index 0172df8..55304fc 100644 --- a/packages/linux/5.11.21/chksum +++ b/packages/linux/5.11.21/chksum @@ -2,3 +2,7 @@ md5 linux-5.11.21.tar.xz d485990d97883550e7fe72932651f08b sha1 linux-5.11.21.tar.xz eda5170155d72c9858e0b83bf9dca72139006fff sha256 linux-5.11.21.tar.xz 366ba5bb00be28b604aac630c4f64301063892f27353b299177c396af0ad877f sha512 linux-5.11.21.tar.xz 69a9c0bb1fe922aa755f52b8cf48bf64be62419e3b021295cd16a4aeaca2f18726ce1635cd79bcaa0312200fa6d0b41ebd3db28e5dc1e02d0bf29ac000136122 +md5 linux-5.11.21.tar.gz 1b1df98e29bfa115aac8a4a389c09066 +sha1 linux-5.11.21.tar.gz 4132397fb235e684e4ec28a93efdbf44556ce296 +sha256 linux-5.11.21.tar.gz b0209e96c4de01f860b2da3789b6b6d64d8fa09145d60b337d93b76e44a8b854 +sha512 linux-5.11.21.tar.gz 00845496fbba005d36bac8e80a9038c0e3f3d944a762fed7b1f1c07604d10fb414f932a97793ec77975e3c3693eb9ee7d4da060ee9e3c0c4a9fe00c825c763d4 diff --git a/packages/linux/5.5.19/chksum b/packages/linux/5.5.19/chksum new file mode 100644 index 0000000..348b4d9 --- /dev/null +++ b/packages/linux/5.5.19/chksum @@ -0,0 +1,8 @@ +md5 linux-5.5.19.tar.xz c87fea1d5f1759112c09ec5800c1ccd8 +sha1 linux-5.5.19.tar.xz f923b51db4b610fb8866cd9d3a7dd6bc85c19ffb +sha256 linux-5.5.19.tar.xz 1448334371fb52f511255726832464d33877a210a7350260fb18eb225ae211eb +sha512 linux-5.5.19.tar.xz 6eb7727b53b32cc1af33cf3561340b29f0e4ec6fb105f07470b4be19bc6617cef11b9fef1f82e0b10dc063367817173440002023cdfbd71cba5e355b4f6d4db5 +md5 linux-5.5.19.tar.gz 4118442d1e9c0be636b0b6b5bdcbde7f +sha1 linux-5.5.19.tar.gz 27183db540df67073163ae2d1cebf1980de667b5 +sha256 linux-5.5.19.tar.gz 42ba6d7211140f20f760807266e8422ed60eef0a4c47fe8f3e335b7f25d0e498 +sha512 linux-5.5.19.tar.gz f73131a096f5dadb81687f4f8257279cb74bad8121e4a132bed7e18667b373b7d491860ddfa050ca0fd09b9863318453ccad31b3590b676ef0820557a0508f00 diff --git a/packages/mingw-w64/v8.0.2/chksum b/packages/mingw-w64/v8.0.2/chksum index 7387137..9fb8440 100644 --- a/packages/mingw-w64/v8.0.2/chksum +++ b/packages/mingw-w64/v8.0.2/chksum @@ -6,4 +6,3 @@ md5 mingw-w64-v8.0.2.zip b406ac028e0910f67767a2055f1ae5a4 sha1 mingw-w64-v8.0.2.zip 5fbc20f3a31dcf53bebd557e99a0445b2f519069 sha256 mingw-w64-v8.0.2.zip 81f277f8ce692ba732d8b37172496e1d05a7fe83928ed534b24bfc595039cc98 sha512 mingw-w64-v8.0.2.zip 541af10f9192caaf45c88312c718b7961b796abc79bbd6e179b2719b0c89d5969ffedf3da87712cd00bbd4e4e546c72c84eb41b313ea4c9c8f46e90d6d3c54c1 - diff --git a/packages/mingw-w64/v9.0.0/chksum b/packages/mingw-w64/v9.0.0/chksum index 9532d91..94c83fd 100644 --- a/packages/mingw-w64/v9.0.0/chksum +++ b/packages/mingw-w64/v9.0.0/chksum @@ -1,4 +1,4 @@ -md5 mingw-w64-9.0.0.tar.bz2 f22c1dcc6288926199b24d9861e19de5 +md5 mingw-w64-v9.0.0.tar.bz2 f22c1dcc6288926199b24d9861e19de5 sha1 mingw-w64-v9.0.0.tar.bz2 9c496ed063e085888d250cc461ec4d31d97b72f1 sha256 mingw-w64-v9.0.0.tar.bz2 1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181 sha512 mingw-w64-v9.0.0.tar.bz2 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386 diff --git a/packages/musl/1.2.1/chksum b/packages/musl/1.2.1/chksum index 1861bde..73d612d 100644 --- a/packages/musl/1.2.1/chksum +++ b/packages/musl/1.2.1/chksum @@ -1,4 +1,4 @@ md5 musl-1.2.1.tar.gz 2720bdbed739e94c4d7acdc91c0cd9d6 sha1 musl-1.2.1.tar.gz 031062cf1a3c3e81e3dbae5ad2edbeff02ca198f sha256 musl-1.2.1.tar.gz 68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b -sha512 musl-1.2.1.tar.gz 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960 \ No newline at end of file +sha512 musl-1.2.1.tar.gz 455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960 diff --git a/packages/uClibc-ng/1.0.33/chksum b/packages/uClibc-ng/1.0.33/chksum index eed77a4..ef1c06c 100644 --- a/packages/uClibc-ng/1.0.33/chksum +++ b/packages/uClibc-ng/1.0.33/chksum @@ -2,6 +2,10 @@ md5 uClibc-ng-1.0.33.tar.xz ec5f253bb0c61834fcd2d61b1be594b8 sha1 uClibc-ng-1.0.33.tar.xz 79142cbea010d691e3007b13226cc23f705ef836 sha256 uClibc-ng-1.0.33.tar.xz aa7c361fddddf90b40a90e04431e607e2da21a5e8e2840a6db9ffd0c89d03e0d sha512 uClibc-ng-1.0.33.tar.xz badc4bed19787d74813e1f050d5652fa48c69e9823f4c2d04e02074108250bdc25022776a6420c4afdcebcc0e8df61367da92f3a68ae8ff74a8e956983363095 +md5 uClibc-ng-1.0.33.tar.lz d41d8cd98f00b204e9800998ecf8427e +sha1 uClibc-ng-1.0.33.tar.lz da39a3ee5e6b4b0d3255bfef95601890afd80709 +sha256 uClibc-ng-1.0.33.tar.lz e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 +sha512 uClibc-ng-1.0.33.tar.lz cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e md5 uClibc-ng-1.0.33.tar.bz2 c5b8cda53e14b361bb24c7a70a2c2b67 sha1 uClibc-ng-1.0.33.tar.bz2 7b15e9748003fd6cf55e19121b79e32506497002 sha256 uClibc-ng-1.0.33.tar.bz2 b10f3e4f4802d78ee2c0342f3e08337a8a85af11f52b135acf1066a6b0eec963 -- cgit v0.10.2-6-g49f6 From 86c2982568de1ad4d4cc12a65b19231331484405 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 10 Feb 2022 18:00:59 -0800 Subject: Run patches thru `manage-packages -P` This refreshes the line numbers, removes any fuzz (which would make any future forward ports easier) and standardizes the patch/file headers (which makes them easier to read). Signed-off-by: Alexey Neyman diff --git a/packages/binutils/2.26.1/0013-Fix-a-missing-include-of-string.patch b/packages/binutils/2.26.1/0013-Fix-a-missing-include-of-string.patch index b04033a..8ba0e8d 100644 --- a/packages/binutils/2.26.1/0013-Fix-a-missing-include-of-string.patch +++ b/packages/binutils/2.26.1/0013-Fix-a-missing-include-of-string.patch @@ -9,11 +9,9 @@ gold/ChangeLog: * errors.h: Include string. --- - gold/errors.h | 1 + + gold/errors.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/gold/errors.h b/gold/errors.h -index 1e61c8dbb5..805b25fc9c 100644 --- a/gold/errors.h +++ b/gold/errors.h @@ -24,6 +24,7 @@ diff --git a/packages/binutils/2.27/0012-Fix-a-missing-include-of-string.patch b/packages/binutils/2.27/0012-Fix-a-missing-include-of-string.patch index b04033a..8ba0e8d 100644 --- a/packages/binutils/2.27/0012-Fix-a-missing-include-of-string.patch +++ b/packages/binutils/2.27/0012-Fix-a-missing-include-of-string.patch @@ -9,11 +9,9 @@ gold/ChangeLog: * errors.h: Include string. --- - gold/errors.h | 1 + + gold/errors.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/gold/errors.h b/gold/errors.h -index 1e61c8dbb5..805b25fc9c 100644 --- a/gold/errors.h +++ b/gold/errors.h @@ -24,6 +24,7 @@ diff --git a/packages/binutils/2.28.1/0009-Fix-a-missing-include-of-string.patch b/packages/binutils/2.28.1/0009-Fix-a-missing-include-of-string.patch index b04033a..8ba0e8d 100644 --- a/packages/binutils/2.28.1/0009-Fix-a-missing-include-of-string.patch +++ b/packages/binutils/2.28.1/0009-Fix-a-missing-include-of-string.patch @@ -9,11 +9,9 @@ gold/ChangeLog: * errors.h: Include string. --- - gold/errors.h | 1 + + gold/errors.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/gold/errors.h b/gold/errors.h -index 1e61c8dbb5..805b25fc9c 100644 --- a/gold/errors.h +++ b/gold/errors.h @@ -24,6 +24,7 @@ diff --git a/packages/binutils/2.29.1/0009-Fix-a-missing-include-of-string.patch b/packages/binutils/2.29.1/0009-Fix-a-missing-include-of-string.patch index b04033a..8ba0e8d 100644 --- a/packages/binutils/2.29.1/0009-Fix-a-missing-include-of-string.patch +++ b/packages/binutils/2.29.1/0009-Fix-a-missing-include-of-string.patch @@ -9,11 +9,9 @@ gold/ChangeLog: * errors.h: Include string. --- - gold/errors.h | 1 + + gold/errors.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/gold/errors.h b/gold/errors.h -index 1e61c8dbb5..805b25fc9c 100644 --- a/gold/errors.h +++ b/gold/errors.h @@ -24,6 +24,7 @@ diff --git a/packages/binutils/2.30/0009-Fix-a-missing-include-of-string.patch b/packages/binutils/2.30/0009-Fix-a-missing-include-of-string.patch index b04033a..8ba0e8d 100644 --- a/packages/binutils/2.30/0009-Fix-a-missing-include-of-string.patch +++ b/packages/binutils/2.30/0009-Fix-a-missing-include-of-string.patch @@ -9,11 +9,9 @@ gold/ChangeLog: * errors.h: Include string. --- - gold/errors.h | 1 + + gold/errors.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/gold/errors.h b/gold/errors.h -index 1e61c8dbb5..805b25fc9c 100644 --- a/gold/errors.h +++ b/gold/errors.h @@ -24,6 +24,7 @@ diff --git a/packages/binutils/2.31.1/0012-Fix-a-missing-include-of-string.patch b/packages/binutils/2.31.1/0012-Fix-a-missing-include-of-string.patch index b04033a..8ba0e8d 100644 --- a/packages/binutils/2.31.1/0012-Fix-a-missing-include-of-string.patch +++ b/packages/binutils/2.31.1/0012-Fix-a-missing-include-of-string.patch @@ -9,11 +9,9 @@ gold/ChangeLog: * errors.h: Include string. --- - gold/errors.h | 1 + + gold/errors.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/gold/errors.h b/gold/errors.h -index 1e61c8dbb5..805b25fc9c 100644 --- a/gold/errors.h +++ b/gold/errors.h @@ -24,6 +24,7 @@ diff --git a/packages/binutils/2.32/0009-Fix-a-missing-include-of-string.patch b/packages/binutils/2.32/0009-Fix-a-missing-include-of-string.patch index b04033a..8ba0e8d 100644 --- a/packages/binutils/2.32/0009-Fix-a-missing-include-of-string.patch +++ b/packages/binutils/2.32/0009-Fix-a-missing-include-of-string.patch @@ -9,11 +9,9 @@ gold/ChangeLog: * errors.h: Include string. --- - gold/errors.h | 1 + + gold/errors.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/gold/errors.h b/gold/errors.h -index 1e61c8dbb5..805b25fc9c 100644 --- a/gold/errors.h +++ b/gold/errors.h @@ -24,6 +24,7 @@ diff --git a/packages/binutils/2.33.1/0000-sh-conf.patch b/packages/binutils/2.33.1/0000-sh-conf.patch index f636289..ecd28af 100644 --- a/packages/binutils/2.33.1/0000-sh-conf.patch +++ b/packages/binutils/2.33.1/0000-sh-conf.patch @@ -12,7 +12,7 @@ inept targets than that one, really. Go look, I promise). --- a/configure +++ b/configure -@@ -3865,7 +3865,7 @@ case "${target}" in +@@ -3865,7 +3865,7 @@ nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -23,7 +23,7 @@ inept targets than that one, really. Go look, I promise). ;; --- a/configure.ac +++ b/configure.ac -@@ -1158,7 +1158,7 @@ case "${target}" in +@@ -1158,7 +1158,7 @@ nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; diff --git a/packages/binutils/2.33.1/0001-ld_makefile_patch.patch b/packages/binutils/2.33.1/0001-ld_makefile_patch.patch index e76207e..f73ff26 100644 --- a/packages/binutils/2.33.1/0001-ld_makefile_patch.patch +++ b/packages/binutils/2.33.1/0001-ld_makefile_patch.patch @@ -5,7 +5,7 @@ --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif +@@ -57,7 +57,7 @@ # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -16,7 +16,7 @@ EMULATION_OFILES = @EMULATION_OFILES@ --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -563,7 +563,7 @@ # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/packages/binutils/2.33.1/0002-check_ldrunpath_length.patch b/packages/binutils/2.33.1/0002-check_ldrunpath_length.patch index 131c6bf..95730af 100644 --- a/packages/binutils/2.33.1/0002-check_ldrunpath_length.patch +++ b/packages/binutils/2.33.1/0002-check_ldrunpath_length.patch @@ -4,7 +4,7 @@ --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em -@@ -1470,6 +1470,8 @@ fragment <&5 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -243,7 +243,10 @@ AM_PO_SUBDIRS +@@ -243,7 +243,10 @@ AC_EXEEXT AC_PROG_YACC diff --git a/packages/binutils/2.33.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.33.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch index 0537aa4..2b32b9a 100644 --- a/packages/binutils/2.33.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch +++ b/packages/binutils/2.33.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch @@ -15,7 +15,7 @@ Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c -@@ -3623,6 +3623,28 @@ u16_mbtouc (wchar_t * puc, const unsigne +@@ -3623,6 +3623,28 @@ } #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */ @@ -46,7 +46,7 @@ Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b) --- a/gold/gold-threads.cc +++ b/gold/gold-threads.cc -@@ -284,9 +284,18 @@ Condvar::~Condvar() +@@ -284,9 +284,18 @@ class Once_initialize { public: diff --git a/packages/binutils/2.33.1/0007-sysroot.patch b/packages/binutils/2.33.1/0007-sysroot.patch index bcf6f34..ba7940a 100644 --- a/packages/binutils/2.33.1/0007-sysroot.patch +++ b/packages/binutils/2.33.1/0007-sysroot.patch @@ -11,7 +11,7 @@ http://sourceware.org/bugzilla/show_bug.cgi?id=10340 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -338,18 +338,25 @@ ldfile_open_file_search (const char *arc +@@ -338,18 +338,25 @@ directory first. */ if (!entry->flags.maybe_archive) { diff --git a/packages/binutils/2.33.1/0008-poison-system-directories.patch b/packages/binutils/2.33.1/0008-poison-system-directories.patch index 907036c..461c8df 100644 --- a/packages/binutils/2.33.1/0008-poison-system-directories.patch +++ b/packages/binutils/2.33.1/0008-poison-system-directories.patch @@ -85,7 +85,7 @@ Signed-off-by: Scott Garman --- a/ld/configure +++ b/ld/configure -@@ -823,6 +823,7 @@ with_lib_path +@@ -823,6 +823,7 @@ enable_targets enable_64_bit_bfd with_sysroot @@ -93,7 +93,7 @@ Signed-off-by: Scott Garman enable_gold enable_got enable_compressed_debug_sections -@@ -1487,6 +1488,8 @@ Optional Features: +@@ -1487,6 +1488,8 @@ --disable-largefile omit support for large files --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -102,7 +102,7 @@ Signed-off-by: Scott Garman --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -15804,7 +15807,18 @@ else +@@ -15804,7 +15807,18 @@ fi @@ -123,7 +123,7 @@ Signed-off-by: Scott Garman if test "${enable_got+set}" = set; then : --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) +@@ -94,6 +94,16 @@ AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -142,7 +142,7 @@ Signed-off-by: Scott Garman dnl "installed_linker" is the installed BFD linker name. --- a/ld/ld.h +++ b/ld/ld.h -@@ -175,6 +175,14 @@ typedef struct +@@ -175,6 +175,14 @@ /* If set, display the target memory usage (per memory region). */ bfd_boolean print_memory_usage; @@ -159,7 +159,7 @@ Signed-off-by: Scott Garman in the linker script. */ --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2557,6 +2557,18 @@ string identifying the original linked f +@@ -2557,6 +2557,18 @@ Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -180,7 +180,7 @@ Signed-off-by: Scott Garman @c man end --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *nam +@@ -116,6 +116,23 @@ new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -206,7 +206,7 @@ Signed-off-by: Scott Garman /* Try to open a BFD for a lang_input_statement. */ --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -150,6 +150,8 @@ enum option_values +@@ -150,6 +150,8 @@ OPTION_FORCE_GROUP_ALLOCATION, OPTION_PRINT_MAP_DISCARDED, OPTION_NO_PRINT_MAP_DISCARDED, @@ -217,7 +217,7 @@ Signed-off-by: Scott Garman /* The initial parser states. */ --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) +@@ -270,6 +270,8 @@ command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -228,7 +228,7 @@ Signed-off-by: Scott Garman COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options +@@ -549,6 +549,14 @@ { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -243,7 +243,7 @@ Signed-off-by: Scott Garman }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -561,6 +569,7 @@ parse_args (unsigned argc, char **argv) +@@ -561,6 +569,7 @@ int ingroup = 0; char *default_dirlist = NULL; char *shortopts; @@ -251,7 +251,7 @@ Signed-off-by: Scott Garman struct option *longopts; struct option *really_longopts; int last_optind; -@@ -1549,6 +1558,14 @@ parse_args (unsigned argc, char **argv) +@@ -1549,6 +1558,14 @@ } break; @@ -266,7 +266,7 @@ Signed-off-by: Scott Garman case OPTION_PUSH_STATE: input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -@@ -1600,6 +1617,10 @@ parse_args (unsigned argc, char **argv) +@@ -1600,6 +1617,10 @@ command_line.soname = NULL; } diff --git a/packages/binutils/2.35.1/0000-sh-conf.patch b/packages/binutils/2.35.1/0000-sh-conf.patch index 06693ef..b7e07d9 100644 --- a/packages/binutils/2.35.1/0000-sh-conf.patch +++ b/packages/binutils/2.35.1/0000-sh-conf.patch @@ -12,7 +12,7 @@ inept targets than that one, really. Go look, I promise). --- a/configure +++ b/configure -@@ -3937,7 +3937,7 @@ case "${target}" in +@@ -3937,7 +3937,7 @@ nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -23,7 +23,7 @@ inept targets than that one, really. Go look, I promise). ;; --- a/configure.ac +++ b/configure.ac -@@ -1178,7 +1178,7 @@ case "${target}" in +@@ -1178,7 +1178,7 @@ nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; diff --git a/packages/binutils/2.35.1/0001-ld_makefile_patch.patch b/packages/binutils/2.35.1/0001-ld_makefile_patch.patch index 0eb9496..5a64fb9 100644 --- a/packages/binutils/2.35.1/0001-ld_makefile_patch.patch +++ b/packages/binutils/2.35.1/0001-ld_makefile_patch.patch @@ -5,7 +5,7 @@ --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -50,7 +50,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -50,7 +50,7 @@ # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -16,7 +16,7 @@ EMULATION_OFILES = @EMULATION_OFILES@ --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -555,7 +555,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -555,7 +555,7 @@ # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/packages/binutils/2.35.1/0002-check_ldrunpath_length.patch b/packages/binutils/2.35.1/0002-check_ldrunpath_length.patch index 0edd2fe..407b48c 100644 --- a/packages/binutils/2.35.1/0002-check_ldrunpath_length.patch +++ b/packages/binutils/2.35.1/0002-check_ldrunpath_length.patch @@ -4,7 +4,7 @@ --- a/ld/ldelf.c +++ b/ld/ldelf.c -@@ -1247,6 +1247,8 @@ ldelf_after_open (int use_libpath, int n +@@ -1247,6 +1247,8 @@ && command_line.rpath == NULL) { path = (const char *) getenv ("LD_RUN_PATH"); @@ -13,7 +13,7 @@ if (path && ldelf_search_needed (path, &n, force, is_linux, elfsize)) -@@ -1605,6 +1607,8 @@ ldelf_before_allocation (char *audit, ch +@@ -1605,6 +1607,8 @@ rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); diff --git a/packages/binutils/2.35.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.35.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch index c712df5..99dee96 100644 --- a/packages/binutils/2.35.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch +++ b/packages/binutils/2.35.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch @@ -4,7 +4,7 @@ --- a/gold/gold-threads.cc +++ b/gold/gold-threads.cc -@@ -101,7 +101,7 @@ Lock_impl_threads::Lock_impl_threads() +@@ -101,7 +101,7 @@ int err = pthread_mutexattr_init(&attr); if (err != 0) gold_fatal(_("pthead_mutexattr_init failed: %s"), strerror(err)); diff --git a/packages/binutils/2.35.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.35.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch index 02efa21..fd6b203 100644 --- a/packages/binutils/2.35.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch +++ b/packages/binutils/2.35.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch @@ -9,7 +9,7 @@ --- a/binutils/configure +++ b/binutils/configure -@@ -12570,6 +12570,7 @@ fi +@@ -12570,6 +12570,7 @@ done test -n "$YACC" || YACC="yacc" @@ -17,7 +17,7 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -12733,6 +12734,8 @@ esac +@@ -12733,6 +12734,8 @@ if test "$LEX" = :; then LEX=${am_missing_run}flex fi @@ -28,7 +28,7 @@ # If we haven't got the data from the intl directory, --- a/binutils/configure.ac +++ b/binutils/configure.ac -@@ -95,7 +95,10 @@ if test -z "$host" ; then +@@ -95,7 +95,10 @@ fi AC_PROG_YACC @@ -41,7 +41,7 @@ ZW_GNU_GETTEXT_SISTER_DIR --- a/gas/configure +++ b/gas/configure -@@ -13519,6 +13519,7 @@ fi +@@ -13519,6 +13519,7 @@ done test -n "$YACC" || YACC="yacc" @@ -49,7 +49,7 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -13682,6 +13683,8 @@ esac +@@ -13682,6 +13683,8 @@ if test "$LEX" = :; then LEX=${am_missing_run}flex fi @@ -60,7 +60,7 @@ # If we haven't got the data from the intl directory, --- a/gas/configure.ac +++ b/gas/configure.ac -@@ -924,7 +924,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR, "${tar +@@ -924,7 +924,10 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "${target_os}", [Target OS.]) AC_PROG_YACC @@ -73,7 +73,7 @@ ZW_GNU_GETTEXT_SISTER_DIR --- a/ld/configure +++ b/ld/configure -@@ -16584,6 +16584,7 @@ fi +@@ -16584,6 +16584,7 @@ done test -n "$YACC" || YACC="yacc" @@ -81,7 +81,7 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -16747,6 +16748,8 @@ esac +@@ -16747,6 +16748,8 @@ if test "$LEX" = :; then LEX=${am_missing_run}flex fi @@ -92,7 +92,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -258,7 +258,10 @@ AM_PO_SUBDIRS +@@ -258,7 +258,10 @@ AC_EXEEXT AC_PROG_YACC diff --git a/packages/binutils/2.35.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.35.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch index 631d013..6f2d1e1 100644 --- a/packages/binutils/2.35.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch +++ b/packages/binutils/2.35.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch @@ -15,7 +15,7 @@ Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c -@@ -3696,6 +3696,28 @@ u16_mbtouc (wchar_t * puc, const unsigne +@@ -3696,6 +3696,28 @@ } #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */ @@ -46,7 +46,7 @@ Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b) --- a/gold/gold-threads.cc +++ b/gold/gold-threads.cc -@@ -284,9 +284,18 @@ Condvar::~Condvar() +@@ -284,9 +284,18 @@ class Once_initialize { public: diff --git a/packages/binutils/2.35.1/0007-sysroot.patch b/packages/binutils/2.35.1/0007-sysroot.patch index c98f147..0140fe8 100644 --- a/packages/binutils/2.35.1/0007-sysroot.patch +++ b/packages/binutils/2.35.1/0007-sysroot.patch @@ -11,7 +11,7 @@ http://sourceware.org/bugzilla/show_bug.cgi?id=10340 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -340,18 +340,25 @@ ldfile_open_file_search (const char *arc +@@ -340,18 +340,25 @@ directory first. */ if (!entry->flags.maybe_archive) { diff --git a/packages/binutils/2.35.1/0008-poison-system-directories.patch b/packages/binutils/2.35.1/0008-poison-system-directories.patch index d836f8a..970a7a1 100644 --- a/packages/binutils/2.35.1/0008-poison-system-directories.patch +++ b/packages/binutils/2.35.1/0008-poison-system-directories.patch @@ -85,7 +85,7 @@ Signed-off-by: Scott Garman --- a/ld/configure +++ b/ld/configure -@@ -826,6 +826,7 @@ with_lib_path +@@ -826,6 +826,7 @@ enable_targets enable_64_bit_bfd with_sysroot @@ -93,7 +93,7 @@ Signed-off-by: Scott Garman enable_gold enable_got enable_compressed_debug_sections -@@ -1493,6 +1494,8 @@ Optional Features: +@@ -1493,6 +1494,8 @@ --disable-largefile omit support for large files --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -102,7 +102,7 @@ Signed-off-by: Scott Garman --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -15814,7 +15817,18 @@ else +@@ -15814,7 +15817,18 @@ fi @@ -123,7 +123,7 @@ Signed-off-by: Scott Garman if test "${enable_got+set}" = set; then : --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) +@@ -94,6 +94,16 @@ AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -142,7 +142,7 @@ Signed-off-by: Scott Garman dnl "installed_linker" is the installed BFD linker name. --- a/ld/ld.h +++ b/ld/ld.h -@@ -161,6 +161,14 @@ typedef struct +@@ -161,6 +161,14 @@ /* If set, display the target memory usage (per memory region). */ bfd_boolean print_memory_usage; @@ -159,7 +159,7 @@ Signed-off-by: Scott Garman in the linker script. */ --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2655,6 +2655,18 @@ string identifying the original linked f +@@ -2655,6 +2655,18 @@ Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -180,7 +180,7 @@ Signed-off-by: Scott Garman @c man end --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -206,7 +206,7 @@ Signed-off-by: Scott Garman /* Try to open a BFD for a lang_input_statement. */ --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -155,6 +155,8 @@ enum option_values +@@ -155,6 +155,8 @@ OPTION_NON_CONTIGUOUS_REGIONS, OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, OPTION_DEPENDENCY_FILE, @@ -217,7 +217,7 @@ Signed-off-by: Scott Garman /* The initial parser states. */ --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -321,6 +321,8 @@ main (int argc, char **argv) +@@ -321,6 +321,8 @@ command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -228,7 +228,7 @@ Signed-off-by: Scott Garman COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -572,6 +572,14 @@ static const struct ld_option ld_options +@@ -572,6 +572,14 @@ { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, '\0', NULL, N_("Do not show discarded sections in map file output"), TWO_DASHES }, @@ -243,7 +243,7 @@ Signed-off-by: Scott Garman }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -584,6 +592,7 @@ parse_args (unsigned argc, char **argv) +@@ -584,6 +592,7 @@ int ingroup = 0; char *default_dirlist = NULL; char *shortopts; @@ -251,7 +251,7 @@ Signed-off-by: Scott Garman struct option *longopts; struct option *really_longopts; int last_optind; -@@ -1591,6 +1600,14 @@ parse_args (unsigned argc, char **argv) +@@ -1591,6 +1600,14 @@ } break; @@ -266,7 +266,7 @@ Signed-off-by: Scott Garman case OPTION_PUSH_STATE: input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -@@ -1681,6 +1698,10 @@ parse_args (unsigned argc, char **argv) +@@ -1681,6 +1698,10 @@ command_line.soname = NULL; } diff --git a/packages/binutils/2.35.1/0009-Import-patch-from-mainline-to-fix-decoding-DWARF-inf.patch b/packages/binutils/2.35.1/0009-Import-patch-from-mainline-to-fix-decoding-DWARF-inf.patch index b6b4496..674347f 100644 --- a/packages/binutils/2.35.1/0009-Import-patch-from-mainline-to-fix-decoding-DWARF-inf.patch +++ b/packages/binutils/2.35.1/0009-Import-patch-from-mainline-to-fix-decoding-DWARF-inf.patch @@ -8,11 +8,13 @@ Subject: [PATCH] Import patch from mainline to fix decoding DWARF information * dwarf2.c (scan_unit_for_symbols): Add member entries to the variable table. --- -diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c -index b8f0008a10d..977bf43a6a1 100644 +--- + bfd/dwarf2.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c -@@ -3404,7 +3404,8 @@ scan_unit_for_symbols (struct comp_unit *unit) +@@ -3404,7 +3404,8 @@ else { func = NULL; @@ -22,7 +24,7 @@ index b8f0008a10d..977bf43a6a1 100644 { size_t amt = sizeof (struct varinfo); var = (struct varinfo *) bfd_zalloc (abfd, amt); -@@ -3516,7 +3517,7 @@ scan_unit_for_symbols (struct comp_unit *unit) +@@ -3516,7 +3517,7 @@ spec_var = lookup_var_by_offset (attr.u.val, unit->variable_table); if (spec_var == NULL) @@ -31,6 +33,3 @@ index b8f0008a10d..977bf43a6a1 100644 _bfd_error_handler (_("DWARF error: could not find " "variable specification " "at offset %lx"), --- -2.25.4 - diff --git a/packages/binutils/2.35.1/0010-arm-Fix-the-wrong-error-message-string-for-mve-vldr-.patch b/packages/binutils/2.35.1/0010-arm-Fix-the-wrong-error-message-string-for-mve-vldr-.patch index 9ea369a..7276357 100644 --- a/packages/binutils/2.35.1/0010-arm-Fix-the-wrong-error-message-string-for-mve-vldr-.patch +++ b/packages/binutils/2.35.1/0010-arm-Fix-the-wrong-error-message-string-for-mve-vldr-.patch @@ -36,11 +36,16 @@ gas/ChangeLog: * testsuite/gas/arm/mve-vldr-vstr-bad.l: Likewise. * testsuite/gas/arm/mve-vldr-vstr-bad.s: Likewise. --- -diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c -index a9aaffa3bdd..64475d66729 100644 +--- + gas/config/tc-arm.c | 10 + gas/testsuite/gas/arm/mve-vldr-vstr-bad.d | 5 + gas/testsuite/gas/arm/mve-vldr-vstr-bad.l | 811 ++++++++++++++++++++++++++++++ + gas/testsuite/gas/arm/mve-vldr-vstr-bad.s | 30 + + 4 files changed, 855 insertions(+), 1 deletion(-) + --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c -@@ -5936,7 +5936,15 @@ parse_address_main (char **str, int i, int group_relocations, +@@ -5936,7 +5936,15 @@ if (skip_past_char (&p, '[') == FAIL) { @@ -57,9 +62,6 @@ index a9aaffa3bdd..64475d66729 100644 { /* Bare address - translate to PC-relative offset. */ inst.relocs[0].pc_rel = 1; -diff --git a/gas/testsuite/gas/arm/mve-vldr-vstr-bad.d b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.d -new file mode 100644 -index 00000000000..8989688f0f3 --- /dev/null +++ b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.d @@ -0,0 +1,5 @@ @@ -68,9 +70,6 @@ index 00000000000..8989688f0f3 +#error_output: mve-vldr-vstr-bad.l + +.*: +file format .*arm.* -diff --git a/gas/testsuite/gas/arm/mve-vldr-vstr-bad.l b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.l -new file mode 100644 -index 00000000000..2df3a37ac02 --- /dev/null +++ b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.l @@ -0,0 +1,811 @@ @@ -885,9 +884,6 @@ index 00000000000..2df3a37ac02 +[^:]*:30: Error: syntax error -- `vldrw.s32 q7,r14' +[^:]*:30: Error: syntax error -- `vldrw.u32 q7,r14' +[^:]*:30: Error: syntax error -- `vstrw.32 q7,r14' -diff --git a/gas/testsuite/gas/arm/mve-vldr-vstr-bad.s b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.s -new file mode 100644 -index 00000000000..c72c1296d2f --- /dev/null +++ b/gas/testsuite/gas/arm/mve-vldr-vstr-bad.s @@ -0,0 +1,30 @@ @@ -921,6 +917,3 @@ index 00000000000..c72c1296d2f +vstrw.32 \op2, \op3 +.endr +.endr --- -2.25.4 - diff --git a/packages/binutils/2.36.1/0000-sh-conf.patch b/packages/binutils/2.36.1/0000-sh-conf.patch index 83d40a0..39a56e1 100644 --- a/packages/binutils/2.36.1/0000-sh-conf.patch +++ b/packages/binutils/2.36.1/0000-sh-conf.patch @@ -12,7 +12,7 @@ inept targets than that one, really. Go look, I promise). --- a/configure +++ b/configure -@@ -3887,7 +3887,7 @@ case "${target}" in +@@ -3887,7 +3887,7 @@ nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -23,7 +23,7 @@ inept targets than that one, really. Go look, I promise). ;; --- a/configure.ac +++ b/configure.ac -@@ -1177,7 +1177,7 @@ case "${target}" in +@@ -1177,7 +1177,7 @@ nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; diff --git a/packages/binutils/2.36.1/0001-ld_makefile_patch.patch b/packages/binutils/2.36.1/0001-ld_makefile_patch.patch index 1c03d02..7c49085 100644 --- a/packages/binutils/2.36.1/0001-ld_makefile_patch.patch +++ b/packages/binutils/2.36.1/0001-ld_makefile_patch.patch @@ -5,7 +5,7 @@ --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -50,7 +50,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -50,7 +50,7 @@ # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -16,7 +16,7 @@ EMULATION_OFILES = @EMULATION_OFILES@ --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -561,7 +561,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) +@@ -561,7 +561,7 @@ # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/packages/binutils/2.36.1/0002-check_ldrunpath_length.patch b/packages/binutils/2.36.1/0002-check_ldrunpath_length.patch index d54e656..bf30ca9 100644 --- a/packages/binutils/2.36.1/0002-check_ldrunpath_length.patch +++ b/packages/binutils/2.36.1/0002-check_ldrunpath_length.patch @@ -4,7 +4,7 @@ --- a/ld/ldelf.c +++ b/ld/ldelf.c -@@ -1248,6 +1248,8 @@ ldelf_after_open (int use_libpath, int n +@@ -1248,6 +1248,8 @@ && command_line.rpath == NULL) { path = (const char *) getenv ("LD_RUN_PATH"); @@ -13,7 +13,7 @@ if (path && ldelf_search_needed (path, &n, force, is_linux, elfsize)) -@@ -1608,6 +1610,8 @@ ldelf_before_allocation (char *audit, ch +@@ -1608,6 +1610,8 @@ rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH"); diff --git a/packages/binutils/2.36.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.36.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch index c712df5..99dee96 100644 --- a/packages/binutils/2.36.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch +++ b/packages/binutils/2.36.1/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch @@ -4,7 +4,7 @@ --- a/gold/gold-threads.cc +++ b/gold/gold-threads.cc -@@ -101,7 +101,7 @@ Lock_impl_threads::Lock_impl_threads() +@@ -101,7 +101,7 @@ int err = pthread_mutexattr_init(&attr); if (err != 0) gold_fatal(_("pthead_mutexattr_init failed: %s"), strerror(err)); diff --git a/packages/binutils/2.36.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.36.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch index 5332426..67bac1f 100644 --- a/packages/binutils/2.36.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch +++ b/packages/binutils/2.36.1/0004-Dont-link-to-libfl-as-its-unnecessary.patch @@ -9,7 +9,7 @@ --- a/binutils/configure +++ b/binutils/configure -@@ -12811,6 +12811,7 @@ fi +@@ -12811,6 +12811,7 @@ done test -n "$YACC" || YACC="yacc" @@ -17,7 +17,7 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -12974,6 +12975,8 @@ esac +@@ -12974,6 +12975,8 @@ if test "$LEX" = :; then LEX=${am_missing_run}flex fi @@ -28,7 +28,7 @@ # If we haven't got the data from the intl directory, --- a/binutils/configure.ac +++ b/binutils/configure.ac -@@ -110,7 +110,10 @@ if test -z "$host" ; then +@@ -110,7 +110,10 @@ fi AC_PROG_YACC @@ -41,7 +41,7 @@ ZW_GNU_GETTEXT_SISTER_DIR --- a/gas/configure +++ b/gas/configure -@@ -13558,6 +13558,7 @@ fi +@@ -13558,6 +13558,7 @@ done test -n "$YACC" || YACC="yacc" @@ -49,7 +49,7 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -13721,6 +13722,8 @@ esac +@@ -13721,6 +13722,8 @@ if test "$LEX" = :; then LEX=${am_missing_run}flex fi @@ -60,7 +60,7 @@ # If we haven't got the data from the intl directory, --- a/gas/configure.ac +++ b/gas/configure.ac -@@ -931,7 +931,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR, "${tar +@@ -931,7 +931,10 @@ AC_DEFINE_UNQUOTED(TARGET_OS, "${target_os}", [Target OS.]) AC_PROG_YACC @@ -73,7 +73,7 @@ ZW_GNU_GETTEXT_SISTER_DIR --- a/ld/configure +++ b/ld/configure -@@ -16623,6 +16623,7 @@ fi +@@ -16623,6 +16623,7 @@ done test -n "$YACC" || YACC="yacc" @@ -81,7 +81,7 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -16786,6 +16787,8 @@ esac +@@ -16786,6 +16787,8 @@ if test "$LEX" = :; then LEX=${am_missing_run}flex fi @@ -92,7 +92,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -269,7 +269,10 @@ AM_PO_SUBDIRS +@@ -269,7 +269,10 @@ AC_EXEEXT AC_PROG_YACC diff --git a/packages/binutils/2.36.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.36.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch index 87d047c..6d86900 100644 --- a/packages/binutils/2.36.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch +++ b/packages/binutils/2.36.1/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch @@ -15,7 +15,7 @@ Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c -@@ -3589,6 +3589,28 @@ u16_mbtouc (wchar_t * puc, const unsigne +@@ -3589,6 +3589,28 @@ } #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */ @@ -46,7 +46,7 @@ Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b) --- a/gold/gold-threads.cc +++ b/gold/gold-threads.cc -@@ -284,9 +284,18 @@ Condvar::~Condvar() +@@ -284,9 +284,18 @@ class Once_initialize { public: diff --git a/packages/binutils/2.36.1/0007-sysroot.patch b/packages/binutils/2.36.1/0007-sysroot.patch index c98f147..0140fe8 100644 --- a/packages/binutils/2.36.1/0007-sysroot.patch +++ b/packages/binutils/2.36.1/0007-sysroot.patch @@ -11,7 +11,7 @@ http://sourceware.org/bugzilla/show_bug.cgi?id=10340 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -340,18 +340,25 @@ ldfile_open_file_search (const char *arc +@@ -340,18 +340,25 @@ directory first. */ if (!entry->flags.maybe_archive) { diff --git a/packages/binutils/2.36.1/0008-poison-system-directories.patch b/packages/binutils/2.36.1/0008-poison-system-directories.patch index 126e99c..545a1a3 100644 --- a/packages/binutils/2.36.1/0008-poison-system-directories.patch +++ b/packages/binutils/2.36.1/0008-poison-system-directories.patch @@ -85,7 +85,7 @@ Signed-off-by: Scott Garman --- a/ld/configure +++ b/ld/configure -@@ -828,6 +828,7 @@ with_lib_path +@@ -828,6 +828,7 @@ enable_targets enable_64_bit_bfd with_sysroot @@ -93,7 +93,7 @@ Signed-off-by: Scott Garman enable_gold enable_got enable_compressed_debug_sections -@@ -1496,6 +1497,8 @@ Optional Features: +@@ -1496,6 +1497,8 @@ --disable-largefile omit support for large files --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -102,7 +102,7 @@ Signed-off-by: Scott Garman --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -15841,7 +15844,18 @@ else +@@ -15841,7 +15844,18 @@ fi @@ -123,7 +123,7 @@ Signed-off-by: Scott Garman if test "${enable_got+set}" = set; then : --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) +@@ -94,6 +94,16 @@ AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -142,7 +142,7 @@ Signed-off-by: Scott Garman dnl "installed_linker" is the installed BFD linker name. --- a/ld/ld.h +++ b/ld/ld.h -@@ -161,6 +161,14 @@ typedef struct +@@ -161,6 +161,14 @@ /* If set, display the target memory usage (per memory region). */ bfd_boolean print_memory_usage; @@ -159,7 +159,7 @@ Signed-off-by: Scott Garman in the linker script. */ --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2810,6 +2810,18 @@ string identifying the original linked f +@@ -2810,6 +2810,18 @@ Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -180,7 +180,7 @@ Signed-off-by: Scott Garman @c man end --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *nam +@@ -117,6 +117,23 @@ new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); else new_dirs->name = xstrdup (name); @@ -206,7 +206,7 @@ Signed-off-by: Scott Garman /* Try to open a BFD for a lang_input_statement. */ --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -161,6 +161,8 @@ enum option_values +@@ -161,6 +161,8 @@ OPTION_CTF_VARIABLES, OPTION_NO_CTF_VARIABLES, OPTION_CTF_SHARE_TYPES, @@ -217,7 +217,7 @@ Signed-off-by: Scott Garman /* The initial parser states. */ --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -323,6 +323,8 @@ main (int argc, char **argv) +@@ -323,6 +323,8 @@ command_line.warn_mismatch = TRUE; command_line.warn_search_mismatch = TRUE; command_line.check_section_addresses = -1; @@ -228,7 +228,7 @@ Signed-off-by: Scott Garman COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -591,6 +591,14 @@ static const struct ld_option ld_options +@@ -591,6 +591,14 @@ " is: share-unconflicted (default),\n" " share-duplicated"), TWO_DASHES }, @@ -243,7 +243,7 @@ Signed-off-by: Scott Garman }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -603,6 +611,7 @@ parse_args (unsigned argc, char **argv) +@@ -603,6 +611,7 @@ int ingroup = 0; char *default_dirlist = NULL; char *shortopts; @@ -251,7 +251,7 @@ Signed-off-by: Scott Garman struct option *longopts; struct option *really_longopts; int last_optind; -@@ -1633,6 +1642,14 @@ parse_args (unsigned argc, char **argv) +@@ -1633,6 +1642,14 @@ } break; @@ -266,7 +266,7 @@ Signed-off-by: Scott Garman case OPTION_PUSH_STATE: input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -@@ -1778,6 +1795,10 @@ parse_args (unsigned argc, char **argv) +@@ -1778,6 +1795,10 @@ command_line.soname = NULL; } diff --git a/packages/binutils/2.37/0001-check_ldrunpath_length.patch b/packages/binutils/2.37/0001-check_ldrunpath_length.patch new file mode 100644 index 0000000..13518db --- /dev/null +++ b/packages/binutils/2.37/0001-check_ldrunpath_length.patch @@ -0,0 +1,24 @@ +--- + ld/ldelf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -1250,6 +1250,8 @@ + && command_line.rpath == NULL) + { + path = (const char *) getenv ("LD_RUN_PATH"); ++ if (path && *path == '\0') ++ path = NULL; + if (path + && ldelf_search_needed (path, &n, force, + is_linux, elfsize)) +@@ -1610,6 +1612,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if (rpath && *rpath == '\0') ++ rpath = NULL; + + for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) diff --git a/packages/binutils/2.37/0002-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.37/0002-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch new file mode 100644 index 0000000..99dee96 --- /dev/null +++ b/packages/binutils/2.37/0002-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch @@ -0,0 +1,15 @@ +--- + gold/gold-threads.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/gold/gold-threads.cc ++++ b/gold/gold-threads.cc +@@ -101,7 +101,7 @@ + int err = pthread_mutexattr_init(&attr); + if (err != 0) + gold_fatal(_("pthead_mutexattr_init failed: %s"), strerror(err)); +-#ifdef PTHREAD_MUTEX_ADAPTIVE_NP ++#if defined(PTHREAD_MUTEX_ADAPTIVE_NP) && !defined(_WIN32) + err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); + if (err != 0) + gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err)); diff --git a/packages/binutils/2.37/0002-check_ldrunpath_length.patch b/packages/binutils/2.37/0002-check_ldrunpath_length.patch deleted file mode 100644 index 13518db..0000000 --- a/packages/binutils/2.37/0002-check_ldrunpath_length.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- - ld/ldelf.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/ld/ldelf.c -+++ b/ld/ldelf.c -@@ -1250,6 +1250,8 @@ - && command_line.rpath == NULL) - { - path = (const char *) getenv ("LD_RUN_PATH"); -+ if (path && *path == '\0') -+ path = NULL; - if (path - && ldelf_search_needed (path, &n, force, - is_linux, elfsize)) -@@ -1610,6 +1612,8 @@ - rpath = command_line.rpath; - if (rpath == NULL) - rpath = (const char *) getenv ("LD_RUN_PATH"); -+ if (rpath && *rpath == '\0') -+ rpath = NULL; - - for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) diff --git a/packages/binutils/2.37/0003-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.37/0003-Dont-link-to-libfl-as-its-unnecessary.patch new file mode 100644 index 0000000..c3e525a --- /dev/null +++ b/packages/binutils/2.37/0003-Dont-link-to-libfl-as-its-unnecessary.patch @@ -0,0 +1,105 @@ +--- + binutils/configure | 3 +++ + binutils/configure.ac | 3 +++ + gas/configure | 3 +++ + gas/configure.ac | 3 +++ + ld/configure | 3 +++ + ld/configure.ac | 3 +++ + 6 files changed, 18 insertions(+) + +--- a/binutils/configure ++++ b/binutils/configure +@@ -12233,6 +12233,7 @@ + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -12396,6 +12397,8 @@ + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" + # If we haven't got the data from the intl directory, +--- a/binutils/configure.ac ++++ b/binutils/configure.ac +@@ -136,7 +136,10 @@ + fi + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" + ZW_GNU_GETTEXT_SISTER_DIR +--- a/gas/configure ++++ b/gas/configure +@@ -12880,6 +12880,7 @@ + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -13043,6 +13044,8 @@ + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" + # If we haven't got the data from the intl directory, +--- a/gas/configure.ac ++++ b/gas/configure.ac +@@ -930,7 +930,10 @@ + AC_DEFINE_UNQUOTED(TARGET_OS, "${target_os}", [Target OS.]) + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" + ZW_GNU_GETTEXT_SISTER_DIR +--- a/ld/configure ++++ b/ld/configure +@@ -16035,6 +16035,7 @@ + done + test -n "$YACC" || YACC="yacc" + ++save_LIBS=$LIBS + for ac_prog in flex lex + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -16198,6 +16199,8 @@ + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi ++LIBS=$save_LIBS ++LEXLIB= + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -293,7 +293,10 @@ + AC_EXEEXT + + AC_PROG_YACC ++save_LIBS=$LIBS + AM_PROG_LEX ++LIBS=$save_LIBS ++LEXLIB= + + AM_MAINTAINER_MODE + AM_CONDITIONAL(GENINSRC_NEVER, false) diff --git a/packages/binutils/2.37/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.37/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch deleted file mode 100644 index 99dee96..0000000 --- a/packages/binutils/2.37/0003-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - gold/gold-threads.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/gold/gold-threads.cc -+++ b/gold/gold-threads.cc -@@ -101,7 +101,7 @@ - int err = pthread_mutexattr_init(&attr); - if (err != 0) - gold_fatal(_("pthead_mutexattr_init failed: %s"), strerror(err)); --#ifdef PTHREAD_MUTEX_ADAPTIVE_NP -+#if defined(PTHREAD_MUTEX_ADAPTIVE_NP) && !defined(_WIN32) - err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); - if (err != 0) - gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err)); diff --git a/packages/binutils/2.37/0004-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.37/0004-Darwin-gold-binary-cc-include-string-not-cstring.patch new file mode 100644 index 0000000..fbc4041 --- /dev/null +++ b/packages/binutils/2.37/0004-Darwin-gold-binary-cc-include-string-not-cstring.patch @@ -0,0 +1,15 @@ +--- + gold/binary.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/gold/binary.cc ++++ b/gold/binary.cc +@@ -23,7 +23,7 @@ + #include "gold.h" + + #include +-#include ++#include + + #include "elfcpp.h" + #include "stringpool.h" diff --git a/packages/binutils/2.37/0004-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.37/0004-Dont-link-to-libfl-as-its-unnecessary.patch deleted file mode 100644 index c3e525a..0000000 --- a/packages/binutils/2.37/0004-Dont-link-to-libfl-as-its-unnecessary.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- - binutils/configure | 3 +++ - binutils/configure.ac | 3 +++ - gas/configure | 3 +++ - gas/configure.ac | 3 +++ - ld/configure | 3 +++ - ld/configure.ac | 3 +++ - 6 files changed, 18 insertions(+) - ---- a/binutils/configure -+++ b/binutils/configure -@@ -12233,6 +12233,7 @@ - done - test -n "$YACC" || YACC="yacc" - -+save_LIBS=$LIBS - for ac_prog in flex lex - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -12396,6 +12397,8 @@ - if test "$LEX" = :; then - LEX=${am_missing_run}flex - fi -+LIBS=$save_LIBS -+LEXLIB= - - ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" - # If we haven't got the data from the intl directory, ---- a/binutils/configure.ac -+++ b/binutils/configure.ac -@@ -136,7 +136,10 @@ - fi - - AC_PROG_YACC -+save_LIBS=$LIBS - AM_PROG_LEX -+LIBS=$save_LIBS -+LEXLIB= - - ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW" - ZW_GNU_GETTEXT_SISTER_DIR ---- a/gas/configure -+++ b/gas/configure -@@ -12880,6 +12880,7 @@ - done - test -n "$YACC" || YACC="yacc" - -+save_LIBS=$LIBS - for ac_prog in flex lex - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -13043,6 +13044,8 @@ - if test "$LEX" = :; then - LEX=${am_missing_run}flex - fi -+LIBS=$save_LIBS -+LEXLIB= - - ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" - # If we haven't got the data from the intl directory, ---- a/gas/configure.ac -+++ b/gas/configure.ac -@@ -930,7 +930,10 @@ - AC_DEFINE_UNQUOTED(TARGET_OS, "${target_os}", [Target OS.]) - - AC_PROG_YACC -+save_LIBS=$LIBS - AM_PROG_LEX -+LIBS=$save_LIBS -+LEXLIB= - - ALL_LINGUAS="es fi fr id ja ru rw sv tr uk zh_CN" - ZW_GNU_GETTEXT_SISTER_DIR ---- a/ld/configure -+++ b/ld/configure -@@ -16035,6 +16035,7 @@ - done - test -n "$YACC" || YACC="yacc" - -+save_LIBS=$LIBS - for ac_prog in flex lex - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -16198,6 +16199,8 @@ - if test "$LEX" = :; then - LEX=${am_missing_run}flex - fi -+LIBS=$save_LIBS -+LEXLIB= - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -293,7 +293,10 @@ - AC_EXEEXT - - AC_PROG_YACC -+save_LIBS=$LIBS - AM_PROG_LEX -+LIBS=$save_LIBS -+LEXLIB= - - AM_MAINTAINER_MODE - AM_CONDITIONAL(GENINSRC_NEVER, false) diff --git a/packages/binutils/2.37/0005-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.37/0005-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch new file mode 100644 index 0000000..6728c6e --- /dev/null +++ b/packages/binutils/2.37/0005-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch @@ -0,0 +1,70 @@ +From c39479f4ab4d372b518957871e1f205a03e7c3d6 Mon Sep 17 00:00:00 2001 +From: Andrew Hsieh +Date: Wed, 18 Mar 2015 10:57:24 +0800 +Subject: [PATCH] Fix darwin build + +1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 + doesn't support ended initializer list +2. wcsncasecmp doesn't exist in MacSDK10.6.x + +Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e +--- + bfd/peXXigen.c | 22 ++++++++++++++++++++++ + gold/gold-threads.cc | 15 ++++++++++++--- + 2 files changed, 34 insertions(+), 3 deletions(-) + +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -3614,6 +3614,28 @@ + } + #endif /* not Cygwin/Mingw */ + ++#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L ++/* wcsncasecmp isn't always defined in Mac SDK */ ++static int ++wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n) ++{ ++ wchar_t c1, c2; ++ ++ if (n == 0) ++ return (0); ++ for (; *s1; s1++, s2++) ++ { ++ c1 = towlower(*s1); ++ c2 = towlower(*s2); ++ if (c1 != c2) ++ return ((int)c1 - c2); ++ if (--n == 0) ++ return (0); ++ } ++ return (-*s2); ++} ++#endif ++ + /* Perform a comparison of two entries. */ + static signed int + rsrc_cmp (bool is_name, rsrc_entry * a, rsrc_entry * b) +--- a/gold/gold-threads.cc ++++ b/gold/gold-threads.cc +@@ -284,9 +284,18 @@ + class Once_initialize + { + public: +- Once_initialize() +- : once_(PTHREAD_ONCE_INIT) +- { } ++ Once_initialize() ++#if !defined(__APPLE__) ++ : once_(PTHREAD_ONCE_INIT) ++ { } ++#else ++// In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 doesn't support ++// extended initializer list as above */ ++ { ++ pthread_once_t once_2 = PTHREAD_ONCE_INIT; ++ once_ = once_2; ++ } ++#endif + + // Return a pointer to the pthread_once_t variable. + pthread_once_t* diff --git a/packages/binutils/2.37/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.37/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch deleted file mode 100644 index fbc4041..0000000 --- a/packages/binutils/2.37/0005-Darwin-gold-binary-cc-include-string-not-cstring.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - gold/binary.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/gold/binary.cc -+++ b/gold/binary.cc -@@ -23,7 +23,7 @@ - #include "gold.h" - - #include --#include -+#include - - #include "elfcpp.h" - #include "stringpool.h" diff --git a/packages/binutils/2.37/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.37/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch deleted file mode 100644 index 6728c6e..0000000 --- a/packages/binutils/2.37/0006-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c39479f4ab4d372b518957871e1f205a03e7c3d6 Mon Sep 17 00:00:00 2001 -From: Andrew Hsieh -Date: Wed, 18 Mar 2015 10:57:24 +0800 -Subject: [PATCH] Fix darwin build - -1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 - doesn't support ended initializer list -2. wcsncasecmp doesn't exist in MacSDK10.6.x - -Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e ---- - bfd/peXXigen.c | 22 ++++++++++++++++++++++ - gold/gold-threads.cc | 15 ++++++++++++--- - 2 files changed, 34 insertions(+), 3 deletions(-) - ---- a/bfd/peXXigen.c -+++ b/bfd/peXXigen.c -@@ -3614,6 +3614,28 @@ - } - #endif /* not Cygwin/Mingw */ - -+#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L -+/* wcsncasecmp isn't always defined in Mac SDK */ -+static int -+wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n) -+{ -+ wchar_t c1, c2; -+ -+ if (n == 0) -+ return (0); -+ for (; *s1; s1++, s2++) -+ { -+ c1 = towlower(*s1); -+ c2 = towlower(*s2); -+ if (c1 != c2) -+ return ((int)c1 - c2); -+ if (--n == 0) -+ return (0); -+ } -+ return (-*s2); -+} -+#endif -+ - /* Perform a comparison of two entries. */ - static signed int - rsrc_cmp (bool is_name, rsrc_entry * a, rsrc_entry * b) ---- a/gold/gold-threads.cc -+++ b/gold/gold-threads.cc -@@ -284,9 +284,18 @@ - class Once_initialize - { - public: -- Once_initialize() -- : once_(PTHREAD_ONCE_INIT) -- { } -+ Once_initialize() -+#if !defined(__APPLE__) -+ : once_(PTHREAD_ONCE_INIT) -+ { } -+#else -+// In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 doesn't support -+// extended initializer list as above */ -+ { -+ pthread_once_t once_2 = PTHREAD_ONCE_INIT; -+ once_ = once_2; -+ } -+#endif - - // Return a pointer to the pthread_once_t variable. - pthread_once_t* diff --git a/packages/binutils/2.37/0006-sysroot.patch b/packages/binutils/2.37/0006-sysroot.patch new file mode 100644 index 0000000..3b3c0ec --- /dev/null +++ b/packages/binutils/2.37/0006-sysroot.patch @@ -0,0 +1,41 @@ +Signed-off-by: Sven Rebhan + +Always try to prepend the sysroot prefix to absolute filenames first. + +http://bugs.gentoo.org/275666 +http://sourceware.org/bugzilla/show_bug.cgi?id=10340 + +--- + ld/ldfile.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -340,18 +340,25 @@ + directory first. */ + if (!entry->flags.maybe_archive) + { +- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) ++ /* For absolute pathnames, try to always open the file in the ++ sysroot first. If this fails, try to open the file at the ++ given location. */ ++ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); ++ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) ++ && ld_sysroot) + { + char *name = concat (ld_sysroot, entry->filename, + (const char *) NULL); + if (ldfile_try_open_bfd (name, entry)) + { + entry->filename = name; ++ entry->flags.sysrooted = true; + return true; + } + free (name); + } +- else if (ldfile_try_open_bfd (entry->filename, entry)) ++ ++ if (ldfile_try_open_bfd (entry->filename, entry)) + return true; + + if (IS_ABSOLUTE_PATH (entry->filename)) diff --git a/packages/binutils/2.37/0007-poison-system-directories.patch b/packages/binutils/2.37/0007-poison-system-directories.patch new file mode 100644 index 0000000..0fd1adc --- /dev/null +++ b/packages/binutils/2.37/0007-poison-system-directories.patch @@ -0,0 +1,279 @@ +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman + +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +--- a/ld/config.in ++++ b/ld/config.in +@@ -43,6 +43,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +--- a/ld/configure ++++ b/ld/configure +@@ -829,6 +829,7 @@ + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1498,6 +1499,8 @@ + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15236,7 +15239,18 @@ + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -106,6 +106,16 @@ + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -157,6 +157,14 @@ + /* If set, display the target memory usage (per memory region). */ + bool print_memory_usage; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Should we force section groups to be resolved? Controlled with + --force-group-allocation on the command line or FORCE_GROUP_ALLOCATION + in the linker script. */ +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2863,6 +2863,18 @@ + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -163,6 +163,8 @@ + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,8 @@ + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = true; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -595,6 +595,14 @@ + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -607,6 +615,7 @@ + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1643,6 +1652,14 @@ + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1788,6 +1805,10 @@ + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); diff --git a/packages/binutils/2.37/0007-sysroot.patch b/packages/binutils/2.37/0007-sysroot.patch deleted file mode 100644 index 3b3c0ec..0000000 --- a/packages/binutils/2.37/0007-sysroot.patch +++ /dev/null @@ -1,41 +0,0 @@ -Signed-off-by: Sven Rebhan - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - ---- - ld/ldfile.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -340,18 +340,25 @@ - directory first. */ - if (!entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = true; - return true; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return true; - - if (IS_ABSOLUTE_PATH (entry->filename)) diff --git a/packages/binutils/2.37/0008-arc-Fix-potential-invalid-pointer-access-when-fixing.patch b/packages/binutils/2.37/0008-arc-Fix-potential-invalid-pointer-access-when-fixing.patch new file mode 100644 index 0000000..ade3180 --- /dev/null +++ b/packages/binutils/2.37/0008-arc-Fix-potential-invalid-pointer-access-when-fixing.patch @@ -0,0 +1,217 @@ +From 29d31b4ed96fcbc774740fac91ef77cb3d62a714 Mon Sep 17 00:00:00 2001 +From: Claudiu Zissulescu +Date: Tue, 17 Aug 2021 13:44:17 +0300 +Subject: [PATCH] arc: Fix potential invalid pointer access when fixing got + symbols. + +When statically linking, it can arrive to an undefined weak symbol of +which its value cannot be determined. However, we are having pieces of +code which doesn't take this situation into account, leading to access +a structure which may not be initialized. Fix this situation and add a +test. + +bfd/ +xxxx-xx-xx Cupertino Miranda + Claudiu Zissulescu + + * arc-got.h (arc_static_sym_data): New structure. + (get_static_sym_data): New function. + (relocate_fix_got_relocs_for_got_info): Move the computation fo + symbol value and section to above introduced function, and use + this new function. + +ld/testsuite/ +xxxx-xx-xx Claudiu Zissulescu + + * ld-arc/got-weak.d: New file. + * ld-arc/got-weak.s: Likewise. + +For all the gory details please refer to [1]. +Original fix could be found here [2]. + +[1] https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/issues/402 +[2] https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/commit/29d31b4ed96fcbc774740fac91ef77cb3d62a714 + +Signed-off-by: Claudiu Zissulescu +[Added links to the origins] +Signed-off-by: Alexey Brodkin +--- + bfd/arc-got.h | 94 ++++++++++++++++++++++++----------------- + ld/testsuite/ld-arc/got-weak.d | 12 +++++ + ld/testsuite/ld-arc/got-weak.s | 7 +++ + 3 files changed, 76 insertions(+), 37 deletions(-) + create mode 100644 ld/testsuite/ld-arc/got-weak.d + create mode 100644 ld/testsuite/ld-arc/got-weak.s + +--- a/bfd/arc-got.h ++++ b/bfd/arc-got.h +@@ -262,6 +262,48 @@ + return true; + } + ++struct arc_static_sym_data { ++ bfd_vma sym_value; ++ const char *symbol_name; ++}; ++ ++static struct arc_static_sym_data ++get_static_sym_data (unsigned long r_symndx, ++ Elf_Internal_Sym *local_syms, ++ asection **local_sections, ++ struct elf_link_hash_entry *h, ++ struct arc_relocation_data *reloc_data) ++{ ++ static const char local_name[] = "(local)"; ++ struct arc_static_sym_data ret = { 0, NULL }; ++ ++ if (h != NULL) ++ { ++ BFD_ASSERT (h->root.type != bfd_link_hash_undefweak ++ && h->root.type != bfd_link_hash_undefined); ++ /* TODO: This should not be here. */ ++ reloc_data->sym_value = h->root.u.def.value; ++ reloc_data->sym_section = h->root.u.def.section; ++ ++ ret.sym_value = h->root.u.def.value ++ + h->root.u.def.section->output_section->vma ++ + h->root.u.def.section->output_offset; ++ ++ ret.symbol_name = h->root.root.string; ++ } ++ else ++ { ++ Elf_Internal_Sym *sym = local_syms + r_symndx; ++ asection *sec = local_sections[r_symndx]; ++ ++ ret.sym_value = sym->st_value ++ + sec->output_section->vma ++ + sec->output_offset; ++ ++ ret.symbol_name = local_name; ++ } ++ return ret; ++} + + static bfd_vma + relocate_fix_got_relocs_for_got_info (struct got_entry ** list_p, +@@ -290,38 +332,7 @@ + && SYMBOL_REFERENCES_LOCAL (info, h)))) + { + const char ATTRIBUTE_UNUSED *symbol_name; +- static const char local_name[] = "(local)"; +- asection *tls_sec = NULL; +- bfd_vma sym_value = 0; +- +- if (h != NULL) +- { +- /* TODO: This should not be here. */ +- reloc_data->sym_value = h->root.u.def.value; +- reloc_data->sym_section = h->root.u.def.section; +- +- sym_value = h->root.u.def.value +- + h->root.u.def.section->output_section->vma +- + h->root.u.def.section->output_offset; +- +- tls_sec = elf_hash_table (info)->tls_sec; +- +- symbol_name = h->root.root.string; +- } +- else +- { +- Elf_Internal_Sym *sym = local_syms + r_symndx; +- asection *sec = local_sections[r_symndx]; +- +- sym_value = sym->st_value +- + sec->output_section->vma +- + sec->output_offset; +- +- tls_sec = elf_hash_table (info)->tls_sec; +- +- symbol_name = local_name; +- } +- ++ asection *tls_sec = elf_hash_table (info)->tls_sec; + + if (entry && !entry->processed) + { +@@ -335,8 +346,12 @@ + if (h == NULL || h->forced_local + || !elf_hash_table (info)->dynamic_sections_created) + { ++ struct arc_static_sym_data tmp = ++ get_static_sym_data (r_symndx, local_syms, local_sections, ++ h, reloc_data); ++ + bfd_put_32 (output_bfd, +- sym_value - sec_vma ++ tmp.sym_value - sec_vma + + (elf_hash_table (info)->dynamic_sections_created + ? 0 + : (align_power (0, +@@ -355,7 +370,7 @@ + + entry->offset + + (entry->existing_entries == TLS_GOT_MOD_AND_OFF + ? 4 : 0)), +- symbol_name); ++ tmp.symbol_name); + } + } + break; +@@ -366,8 +381,12 @@ + bfd_vma ATTRIBUTE_UNUSED sec_vma + = tls_sec->output_section->vma; + ++ struct arc_static_sym_data tmp = ++ get_static_sym_data (r_symndx, local_syms, local_sections, ++ h, reloc_data); ++ + bfd_put_32 (output_bfd, +- sym_value - sec_vma ++ tmp.sym_value - sec_vma + + (elf_hash_table (info)->dynamic_sections_created + ? 0 + : (align_power (TCB_SIZE, +@@ -386,7 +405,7 @@ + + entry->offset + + (entry->existing_entries == TLS_GOT_MOD_AND_OFF + ? 4 : 0)), +- symbol_name); ++ tmp.symbol_name); + } + break; + +@@ -415,7 +434,8 @@ + "@ %#08lx for sym %s in got offset %#lx\n", + (long) (reloc_data->sym_value + sec_vma), + (long) (htab->sgot->output_section->vma +- + htab->sgot->output_offset + entry->offset), ++ + htab->sgot->output_offset ++ + entry->offset), + symbol_name, + (long) entry->offset); + } +--- /dev/null ++++ b/ld/testsuite/ld-arc/got-weak.d +@@ -0,0 +1,12 @@ ++#source: got-weak.s ++#as: ++#ld: -Bstatic ++#objdump: -d ++ ++[^:]*: file format elf32-.*arc ++ ++ ++Disassembly of section \.text: ++ ++00000100 <.*>: ++ 100: 2730 7f80 0000 2014 ld r0,\[pcl,0x2014\].* +--- /dev/null ++++ b/ld/testsuite/ld-arc/got-weak.s +@@ -0,0 +1,7 @@ ++ .cpu archs ++ ++ .weak symb ++ .global __start ++ .text ++__start: ++ ld r0,[pcl,@symb@gotpc] diff --git a/packages/binutils/2.37/0008-poison-system-directories.patch b/packages/binutils/2.37/0008-poison-system-directories.patch deleted file mode 100644 index 0fd1adc..0000000 --- a/packages/binutils/2.37/0008-poison-system-directories.patch +++ /dev/null @@ -1,279 +0,0 @@ -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman - ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - ---- a/ld/config.in -+++ b/ld/config.in -@@ -43,6 +43,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - ---- a/ld/configure -+++ b/ld/configure -@@ -829,6 +829,7 @@ - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1498,6 +1499,8 @@ - --enable-checking enable run-time checks - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15236,7 +15239,18 @@ - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -106,6 +106,16 @@ - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -157,6 +157,14 @@ - /* If set, display the target memory usage (per memory region). */ - bool print_memory_usage; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bool poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bool error_poison_system_directories; -+ - /* Should we force section groups to be resolved? Controlled with - --force-group-allocation on the command line or FORCE_GROUP_ALLOCATION - in the linker script. */ ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2863,6 +2863,18 @@ - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -163,6 +163,8 @@ - OPTION_CTF_VARIABLES, - OPTION_NO_CTF_VARIABLES, - OPTION_CTF_SHARE_TYPES, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -321,6 +321,8 @@ - command_line.warn_mismatch = true; - command_line.warn_search_mismatch = true; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = true; -+ command_line.error_poison_system_directories = true; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -595,6 +595,14 @@ - " is: share-unconflicted (default),\n" - " share-duplicated"), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -607,6 +615,7 @@ - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1643,6 +1652,14 @@ - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = false; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = true; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1788,6 +1805,10 @@ - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = true; -+ - while (ingroup) - { - einfo (_("%P: missing --end-group; added as last command line option\n")); diff --git a/packages/binutils/2.37/0009-arc-Fix-potential-invalid-pointer-access-when-fixing.patch b/packages/binutils/2.37/0009-arc-Fix-potential-invalid-pointer-access-when-fixing.patch deleted file mode 100644 index ade3180..0000000 --- a/packages/binutils/2.37/0009-arc-Fix-potential-invalid-pointer-access-when-fixing.patch +++ /dev/null @@ -1,217 +0,0 @@ -From 29d31b4ed96fcbc774740fac91ef77cb3d62a714 Mon Sep 17 00:00:00 2001 -From: Claudiu Zissulescu -Date: Tue, 17 Aug 2021 13:44:17 +0300 -Subject: [PATCH] arc: Fix potential invalid pointer access when fixing got - symbols. - -When statically linking, it can arrive to an undefined weak symbol of -which its value cannot be determined. However, we are having pieces of -code which doesn't take this situation into account, leading to access -a structure which may not be initialized. Fix this situation and add a -test. - -bfd/ -xxxx-xx-xx Cupertino Miranda - Claudiu Zissulescu - - * arc-got.h (arc_static_sym_data): New structure. - (get_static_sym_data): New function. - (relocate_fix_got_relocs_for_got_info): Move the computation fo - symbol value and section to above introduced function, and use - this new function. - -ld/testsuite/ -xxxx-xx-xx Claudiu Zissulescu - - * ld-arc/got-weak.d: New file. - * ld-arc/got-weak.s: Likewise. - -For all the gory details please refer to [1]. -Original fix could be found here [2]. - -[1] https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/issues/402 -[2] https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/commit/29d31b4ed96fcbc774740fac91ef77cb3d62a714 - -Signed-off-by: Claudiu Zissulescu -[Added links to the origins] -Signed-off-by: Alexey Brodkin ---- - bfd/arc-got.h | 94 ++++++++++++++++++++++++----------------- - ld/testsuite/ld-arc/got-weak.d | 12 +++++ - ld/testsuite/ld-arc/got-weak.s | 7 +++ - 3 files changed, 76 insertions(+), 37 deletions(-) - create mode 100644 ld/testsuite/ld-arc/got-weak.d - create mode 100644 ld/testsuite/ld-arc/got-weak.s - ---- a/bfd/arc-got.h -+++ b/bfd/arc-got.h -@@ -262,6 +262,48 @@ - return true; - } - -+struct arc_static_sym_data { -+ bfd_vma sym_value; -+ const char *symbol_name; -+}; -+ -+static struct arc_static_sym_data -+get_static_sym_data (unsigned long r_symndx, -+ Elf_Internal_Sym *local_syms, -+ asection **local_sections, -+ struct elf_link_hash_entry *h, -+ struct arc_relocation_data *reloc_data) -+{ -+ static const char local_name[] = "(local)"; -+ struct arc_static_sym_data ret = { 0, NULL }; -+ -+ if (h != NULL) -+ { -+ BFD_ASSERT (h->root.type != bfd_link_hash_undefweak -+ && h->root.type != bfd_link_hash_undefined); -+ /* TODO: This should not be here. */ -+ reloc_data->sym_value = h->root.u.def.value; -+ reloc_data->sym_section = h->root.u.def.section; -+ -+ ret.sym_value = h->root.u.def.value -+ + h->root.u.def.section->output_section->vma -+ + h->root.u.def.section->output_offset; -+ -+ ret.symbol_name = h->root.root.string; -+ } -+ else -+ { -+ Elf_Internal_Sym *sym = local_syms + r_symndx; -+ asection *sec = local_sections[r_symndx]; -+ -+ ret.sym_value = sym->st_value -+ + sec->output_section->vma -+ + sec->output_offset; -+ -+ ret.symbol_name = local_name; -+ } -+ return ret; -+} - - static bfd_vma - relocate_fix_got_relocs_for_got_info (struct got_entry ** list_p, -@@ -290,38 +332,7 @@ - && SYMBOL_REFERENCES_LOCAL (info, h)))) - { - const char ATTRIBUTE_UNUSED *symbol_name; -- static const char local_name[] = "(local)"; -- asection *tls_sec = NULL; -- bfd_vma sym_value = 0; -- -- if (h != NULL) -- { -- /* TODO: This should not be here. */ -- reloc_data->sym_value = h->root.u.def.value; -- reloc_data->sym_section = h->root.u.def.section; -- -- sym_value = h->root.u.def.value -- + h->root.u.def.section->output_section->vma -- + h->root.u.def.section->output_offset; -- -- tls_sec = elf_hash_table (info)->tls_sec; -- -- symbol_name = h->root.root.string; -- } -- else -- { -- Elf_Internal_Sym *sym = local_syms + r_symndx; -- asection *sec = local_sections[r_symndx]; -- -- sym_value = sym->st_value -- + sec->output_section->vma -- + sec->output_offset; -- -- tls_sec = elf_hash_table (info)->tls_sec; -- -- symbol_name = local_name; -- } -- -+ asection *tls_sec = elf_hash_table (info)->tls_sec; - - if (entry && !entry->processed) - { -@@ -335,8 +346,12 @@ - if (h == NULL || h->forced_local - || !elf_hash_table (info)->dynamic_sections_created) - { -+ struct arc_static_sym_data tmp = -+ get_static_sym_data (r_symndx, local_syms, local_sections, -+ h, reloc_data); -+ - bfd_put_32 (output_bfd, -- sym_value - sec_vma -+ tmp.sym_value - sec_vma - + (elf_hash_table (info)->dynamic_sections_created - ? 0 - : (align_power (0, -@@ -355,7 +370,7 @@ - + entry->offset - + (entry->existing_entries == TLS_GOT_MOD_AND_OFF - ? 4 : 0)), -- symbol_name); -+ tmp.symbol_name); - } - } - break; -@@ -366,8 +381,12 @@ - bfd_vma ATTRIBUTE_UNUSED sec_vma - = tls_sec->output_section->vma; - -+ struct arc_static_sym_data tmp = -+ get_static_sym_data (r_symndx, local_syms, local_sections, -+ h, reloc_data); -+ - bfd_put_32 (output_bfd, -- sym_value - sec_vma -+ tmp.sym_value - sec_vma - + (elf_hash_table (info)->dynamic_sections_created - ? 0 - : (align_power (TCB_SIZE, -@@ -386,7 +405,7 @@ - + entry->offset - + (entry->existing_entries == TLS_GOT_MOD_AND_OFF - ? 4 : 0)), -- symbol_name); -+ tmp.symbol_name); - } - break; - -@@ -415,7 +434,8 @@ - "@ %#08lx for sym %s in got offset %#lx\n", - (long) (reloc_data->sym_value + sec_vma), - (long) (htab->sgot->output_section->vma -- + htab->sgot->output_offset + entry->offset), -+ + htab->sgot->output_offset -+ + entry->offset), - symbol_name, - (long) entry->offset); - } ---- /dev/null -+++ b/ld/testsuite/ld-arc/got-weak.d -@@ -0,0 +1,12 @@ -+#source: got-weak.s -+#as: -+#ld: -Bstatic -+#objdump: -d -+ -+[^:]*: file format elf32-.*arc -+ -+ -+Disassembly of section \.text: -+ -+00000100 <.*>: -+ 100: 2730 7f80 0000 2014 ld r0,\[pcl,0x2014\].* ---- /dev/null -+++ b/ld/testsuite/ld-arc/got-weak.s -@@ -0,0 +1,7 @@ -+ .cpu archs -+ -+ .weak symb -+ .global __start -+ .text -+__start: -+ ld r0,[pcl,@symb@gotpc] diff --git a/packages/binutils/2.37/0009-change-uint-to-unsigned.patch b/packages/binutils/2.37/0009-change-uint-to-unsigned.patch new file mode 100644 index 0000000..016016e --- /dev/null +++ b/packages/binutils/2.37/0009-change-uint-to-unsigned.patch @@ -0,0 +1,52 @@ +From 999566402e3d7c69032bbf47e28b44fc0926fe62 Mon Sep 17 00:00:00 2001 +From: Christopher Wellons +Date: Sun, 18 Jul 2021 16:57:19 -0400 +Subject: [PATCH] Change "uint" to "unsigned" + +This fixes a defect introduced in 25162c795. The "uint" type has not +been explicitly defined here on mingw, causing compilation to fail. + +On linux we have this in /usr/include/sys/types.h + +/* Old compatibility names for C types. */ +typedef unsigned long int ulong; +typedef unsigned short int ushort; +typedef unsigned int uint; + +So it's easy to see how such bugs can creep in. + + * rust-demangle.c (struct rust_demangler): Change type of + "recursion" to unsigned. + (RUST_NO_RECURSION_LIMIT): Similarly in cast. +--- + libiberty/ChangeLog | 6 ++++++ + libiberty/rust-demangle.c | 4 ++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +--- a/libiberty/ChangeLog ++++ b/libiberty/ChangeLog +@@ -1,3 +1,9 @@ ++2021-07-19 Christopher Wellons ++ ++ * rust-demangle.c (struct rust_demangler): Change type of ++ "recursion" to unsigned. ++ (RUST_NO_RECURSION_LIMIT): Similarly in cast. ++ + 2021-07-15 Nick Clifton + + PR 99935 +--- a/libiberty/rust-demangle.c ++++ b/libiberty/rust-demangle.c +@@ -75,10 +75,10 @@ + int version; + + /* Recursion depth. */ +- uint recursion; ++ unsigned recursion; + /* Maximum number of times demangle_path may be called recursively. */ + #define RUST_MAX_RECURSION_COUNT 1024 +-#define RUST_NO_RECURSION_LIMIT ((uint) -1) ++#define RUST_NO_RECURSION_LIMIT ((unsigned) -1) + + uint64_t bound_lifetime_depth; + }; diff --git a/packages/binutils/2.37/0010-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch b/packages/binutils/2.37/0010-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch new file mode 100644 index 0000000..1fe3d9c --- /dev/null +++ b/packages/binutils/2.37/0010-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch @@ -0,0 +1,201 @@ +From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 26 Jul 2021 05:59:55 -0700 +Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd + +Close the file descriptor if there is no archive plugin file descriptor +to avoid running out of file descriptors on thin archives with many +archive members. + +bfd/ + + PR ld/28138 + * plugin.c (bfd_plugin_close_file_descriptor): Close the file + descriptor there is no archive plugin file descriptor. + +ld/ + + PR ld/28138 + * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for + native build. + + PR ld/28138 + * testsuite/ld-plugin/lto.exp: Run ld/28138 tests. + * testsuite/ld-plugin/pr28138.c: New file. + * testsuite/ld-plugin/pr28138-1.c: Likewise. + * testsuite/ld-plugin/pr28138-2.c: Likewise. + * testsuite/ld-plugin/pr28138-3.c: Likewise. + * testsuite/ld-plugin/pr28138-4.c: Likewise. + * testsuite/ld-plugin/pr28138-5.c: Likewise. + * testsuite/ld-plugin/pr28138-6.c: Likewise. + * testsuite/ld-plugin/pr28138-7.c: Likewise. + +(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742) +(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2) +--- + bfd/plugin.c | 8 ++++++++ + ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++++++ + ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++ + ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++++ + 10 files changed, 104 insertions(+) + create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c + create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c + create mode 100644 ld/testsuite/ld-plugin/pr28138.c + +--- a/bfd/plugin.c ++++ b/bfd/plugin.c +@@ -291,6 +291,14 @@ + && !bfd_is_thin_archive (abfd->my_archive)) + abfd = abfd->my_archive; + ++ /* Close the file descriptor if there is no archive plugin file ++ descriptor. */ ++ if (abfd->archive_plugin_fd == -1) ++ { ++ close (fd); ++ return; ++ } ++ + abfd->archive_plugin_fd_open_count--; + /* Dup the archive plugin file descriptor for later use, which + will be closed by _bfd_archive_close_and_cleanup. */ +--- a/ld/testsuite/ld-plugin/lto.exp ++++ b/ld/testsuite/ld-plugin/lto.exp +@@ -687,6 +687,40 @@ + } + } + ++run_cc_link_tests [list \ ++ [list \ ++ "Build pr28138.a" \ ++ "-T" "" \ ++ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \ ++ pr28138-6.c pr28138-7.c} {} "pr28138.a" \ ++ ] \ ++ [list \ ++ "Build pr28138.o" \ ++ "" "" \ ++ {pr28138.c} {} \ ++ ] \ ++] ++ ++set exec_output [run_host_cmd "sh" \ ++ "-c \"ulimit -n 20; \ ++ $CC -Btmpdir/ld -o tmpdir/pr28138 \ ++ tmpdir/pr28138.o tmpdir/pr28138.a\""] ++set exec_output [prune_warnings $exec_output] ++if [string match "" $exec_output] then { ++ if { [isnative] } { ++ set exec_output [run_host_cmd "tmpdir/pr28138" ""] ++ if [string match "PASS" $exec_output] then { ++ pass "PR ld/28138" ++ } else { ++ fail "PR ld/28138" ++ } ++ } else { ++ pass "PR ld/28138" ++ } ++} else { ++ fail "PR ld/28138" ++} ++ + set testname "Build liblto-11.a" + remote_file host delete "tmpdir/liblto-11.a" + set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-1.c +@@ -0,0 +1,6 @@ ++extern int a0(void); ++int ++a1(void) ++{ ++ return 1 + a0(); ++} +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-2.c +@@ -0,0 +1,6 @@ ++extern int a1(void); ++int ++a2(void) ++{ ++ return 1 + a1(); ++} +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-3.c +@@ -0,0 +1,6 @@ ++extern int a2(void); ++int ++a3(void) ++{ ++ return 1 + a2(); ++} +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-4.c +@@ -0,0 +1,6 @@ ++extern int a3(void); ++int ++a4(void) ++{ ++ return 1 + a3(); ++} +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-5.c +@@ -0,0 +1,6 @@ ++extern int a4(void); ++int ++a5(void) ++{ ++ return 1 + a4(); ++} +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-6.c +@@ -0,0 +1,6 @@ ++extern int a5(void); ++int ++a6(void) ++{ ++ return 1 + a5(); ++} +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138-7.c +@@ -0,0 +1,6 @@ ++extern int a6(void); ++int ++a7(void) ++{ ++ return 1 + a6(); ++} +--- /dev/null ++++ b/ld/testsuite/ld-plugin/pr28138.c +@@ -0,0 +1,20 @@ ++#include ++ ++extern int a7(void); ++ ++int ++a0(void) ++{ ++ return 0; ++} ++ ++int ++main() ++{ ++ if (a7() == 7) ++ { ++ printf ("PASS\n"); ++ return 0; ++ } ++ return 1; ++} diff --git a/packages/binutils/2.37/0010-change-uint-to-unsigned.patch b/packages/binutils/2.37/0010-change-uint-to-unsigned.patch deleted file mode 100644 index d44b12e..0000000 --- a/packages/binutils/2.37/0010-change-uint-to-unsigned.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 999566402e3d7c69032bbf47e28b44fc0926fe62 Mon Sep 17 00:00:00 2001 -From: Christopher Wellons -Date: Sun, 18 Jul 2021 16:57:19 -0400 -Subject: [PATCH] Change "uint" to "unsigned" - -This fixes a defect introduced in 25162c795. The "uint" type has not -been explicitly defined here on mingw, causing compilation to fail. - -On linux we have this in /usr/include/sys/types.h - -/* Old compatibility names for C types. */ -typedef unsigned long int ulong; -typedef unsigned short int ushort; -typedef unsigned int uint; - -So it's easy to see how such bugs can creep in. - - * rust-demangle.c (struct rust_demangler): Change type of - "recursion" to unsigned. - (RUST_NO_RECURSION_LIMIT): Similarly in cast. ---- - libiberty/ChangeLog | 6 ++++++ - libiberty/rust-demangle.c | 4 ++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog -index 8e39fd28eba8..3f749455f05d 100644 ---- a/libiberty/ChangeLog -+++ b/libiberty/ChangeLog -@@ -1,3 +1,9 @@ -+2021-07-19 Christopher Wellons -+ -+ * rust-demangle.c (struct rust_demangler): Change type of -+ "recursion" to unsigned. -+ (RUST_NO_RECURSION_LIMIT): Similarly in cast. -+ - 2021-07-15 Nick Clifton - - PR 99935 -diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c -index df09b7b8fddb..ac1eb8eb02c6 100644 ---- a/libiberty/rust-demangle.c -+++ b/libiberty/rust-demangle.c -@@ -75,10 +75,10 @@ struct rust_demangler - int version; - - /* Recursion depth. */ -- uint recursion; -+ unsigned recursion; - /* Maximum number of times demangle_path may be called recursively. */ - #define RUST_MAX_RECURSION_COUNT 1024 --#define RUST_NO_RECURSION_LIMIT ((uint) -1) -+#define RUST_NO_RECURSION_LIMIT ((unsigned) -1) - - uint64_t bound_lifetime_depth; - }; diff --git a/packages/binutils/2.37/0011-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch b/packages/binutils/2.37/0011-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch deleted file mode 100644 index 192d4e0..0000000 --- a/packages/binutils/2.37/0011-bfd-close-the-file-descriptor-if-there-is-no-archive-fd.patch +++ /dev/null @@ -1,232 +0,0 @@ -From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 26 Jul 2021 05:59:55 -0700 -Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd - -Close the file descriptor if there is no archive plugin file descriptor -to avoid running out of file descriptors on thin archives with many -archive members. - -bfd/ - - PR ld/28138 - * plugin.c (bfd_plugin_close_file_descriptor): Close the file - descriptor there is no archive plugin file descriptor. - -ld/ - - PR ld/28138 - * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for - native build. - - PR ld/28138 - * testsuite/ld-plugin/lto.exp: Run ld/28138 tests. - * testsuite/ld-plugin/pr28138.c: New file. - * testsuite/ld-plugin/pr28138-1.c: Likewise. - * testsuite/ld-plugin/pr28138-2.c: Likewise. - * testsuite/ld-plugin/pr28138-3.c: Likewise. - * testsuite/ld-plugin/pr28138-4.c: Likewise. - * testsuite/ld-plugin/pr28138-5.c: Likewise. - * testsuite/ld-plugin/pr28138-6.c: Likewise. - * testsuite/ld-plugin/pr28138-7.c: Likewise. - -(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742) -(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2) ---- - bfd/plugin.c | 8 +++++++ - ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++ - ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++ - ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++ - 10 files changed, 104 insertions(+) - create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c - create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c - create mode 100644 ld/testsuite/ld-plugin/pr28138.c - -diff --git a/bfd/plugin.c b/bfd/plugin.c -index 6cfa2b66470..3bab8febe88 100644 ---- a/bfd/plugin.c -+++ b/bfd/plugin.c -@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd) - && !bfd_is_thin_archive (abfd->my_archive)) - abfd = abfd->my_archive; - -+ /* Close the file descriptor if there is no archive plugin file -+ descriptor. */ -+ if (abfd->archive_plugin_fd == -1) -+ { -+ close (fd); -+ return; -+ } -+ - abfd->archive_plugin_fd_open_count--; - /* Dup the archive plugin file descriptor for later use, which - will be closed by _bfd_archive_close_and_cleanup. */ -diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp -index def69e43ab3..999d911ce6a 100644 ---- a/ld/testsuite/ld-plugin/lto.exp -+++ b/ld/testsuite/ld-plugin/lto.exp -@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } { - } - } - -+run_cc_link_tests [list \ -+ [list \ -+ "Build pr28138.a" \ -+ "-T" "" \ -+ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \ -+ pr28138-6.c pr28138-7.c} {} "pr28138.a" \ -+ ] \ -+ [list \ -+ "Build pr28138.o" \ -+ "" "" \ -+ {pr28138.c} {} \ -+ ] \ -+] -+ -+set exec_output [run_host_cmd "sh" \ -+ "-c \"ulimit -n 20; \ -+ $CC -Btmpdir/ld -o tmpdir/pr28138 \ -+ tmpdir/pr28138.o tmpdir/pr28138.a\""] -+set exec_output [prune_warnings $exec_output] -+if [string match "" $exec_output] then { -+ if { [isnative] } { -+ set exec_output [run_host_cmd "tmpdir/pr28138" ""] -+ if [string match "PASS" $exec_output] then { -+ pass "PR ld/28138" -+ } else { -+ fail "PR ld/28138" -+ } -+ } else { -+ pass "PR ld/28138" -+ } -+} else { -+ fail "PR ld/28138" -+} -+ - set testname "Build liblto-11.a" - remote_file host delete "tmpdir/liblto-11.a" - set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] -diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c -new file mode 100644 -index 00000000000..51d119e1642 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-1.c -@@ -0,0 +1,6 @@ -+extern int a0(void); -+int -+a1(void) -+{ -+ return 1 + a0(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c -new file mode 100644 -index 00000000000..1120cd797e9 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-2.c -@@ -0,0 +1,6 @@ -+extern int a1(void); -+int -+a2(void) -+{ -+ return 1 + a1(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c -new file mode 100644 -index 00000000000..ec464947ee6 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-3.c -@@ -0,0 +1,6 @@ -+extern int a2(void); -+int -+a3(void) -+{ -+ return 1 + a2(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c -new file mode 100644 -index 00000000000..475701b2c5c ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-4.c -@@ -0,0 +1,6 @@ -+extern int a3(void); -+int -+a4(void) -+{ -+ return 1 + a3(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c -new file mode 100644 -index 00000000000..e24f86c363e ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-5.c -@@ -0,0 +1,6 @@ -+extern int a4(void); -+int -+a5(void) -+{ -+ return 1 + a4(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c -new file mode 100644 -index 00000000000..b5b938bdb21 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-6.c -@@ -0,0 +1,6 @@ -+extern int a5(void); -+int -+a6(void) -+{ -+ return 1 + a5(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c -new file mode 100644 -index 00000000000..4ef75bf0f0c ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138-7.c -@@ -0,0 +1,6 @@ -+extern int a6(void); -+int -+a7(void) -+{ -+ return 1 + a6(); -+} -diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c -new file mode 100644 -index 00000000000..68252c9f382 ---- /dev/null -+++ b/ld/testsuite/ld-plugin/pr28138.c -@@ -0,0 +1,20 @@ -+#include -+ -+extern int a7(void); -+ -+int -+a0(void) -+{ -+ return 0; -+} -+ -+int -+main() -+{ -+ if (a7() == 7) -+ { -+ printf ("PASS\n"); -+ return 0; -+ } -+ return 1; -+} --- -2.27.0 - diff --git a/packages/binutils/2.37/0011-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch b/packages/binutils/2.37/0011-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch new file mode 100644 index 0000000..de54af3 --- /dev/null +++ b/packages/binutils/2.37/0011-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch @@ -0,0 +1,44 @@ +From 6b02746a0e29b1007efd4feb137e2da3e681fc68 Mon Sep 17 00:00:00 2001 +From: Gleb Fotengauer-Malinovskiy +Date: Tue, 28 Sep 2021 20:11:26 +0930 +Subject: [PATCH] PR28391, strip/objcopy --preserve-dates *.a: cannot set time + +After commit 985e0264516 copy_archive function began to pass invalid +values to the utimensat(2) function when it tries to preserve +timestamps in ar archives. This happens because the bfd_stat_arch_elt +implementation for ar archives fills only the st_mtim.tv_sec part of +the st_mtim timespec structure, but leaves the st_mtim.tv_nsec part +and the whole st_atim timespec untouched leaving them uninitialized + + PR 28391 + * ar.c (extract_file): Clear buf for preserve_dates. + * objcopy.c (copy_archive): Likewise. + +(cherry picked from commit 0d62064867c74286360e821b75ef6799bedc4b34) +--- + binutils/ar.c | 3 +++ + binutils/objcopy.c | 1 + + 2 files changed, 4 insertions(+) + +--- a/binutils/ar.c ++++ b/binutils/ar.c +@@ -1180,6 +1180,9 @@ + bfd_size_type size; + struct stat buf; + ++ if (preserve_dates) ++ memset (&buf, 0, sizeof (buf)); ++ + if (bfd_stat_arch_elt (abfd, &buf) != 0) + /* xgettext:c-format */ + fatal (_("internal stat error on %s"), bfd_get_filename (abfd)); +--- a/binutils/objcopy.c ++++ b/binutils/objcopy.c +@@ -3600,6 +3600,7 @@ + + if (preserve_dates) + { ++ memset (&buf, 0, sizeof (buf)); + stat_status = bfd_stat_arch_elt (this_element, &buf); + + if (stat_status != 0) diff --git a/packages/binutils/2.37/0012-ld-pru-fix-resource_table-output-section-alignment.patch b/packages/binutils/2.37/0012-ld-pru-fix-resource_table-output-section-alignment.patch new file mode 100644 index 0000000..863253e --- /dev/null +++ b/packages/binutils/2.37/0012-ld-pru-fix-resource_table-output-section-alignment.patch @@ -0,0 +1,53 @@ +From a9c3934f6cb4407c5aaae82ada3b859d8ca9df83 Mon Sep 17 00:00:00 2001 +From: Dimitar Dimitrov +Date: Mon, 27 Sep 2021 22:43:24 +0300 +Subject: [PATCH] ld: pru: Fix resource_table output section alignment + +My commit 261980de18b added alignment for the resource table symbol. +But it is wrong. The Linux remoteproc driver loads and interprets the +contents of the .resource_table ELF section, not of a table symbol. + +Without this patch, if the linker happens to output padding for symbol +alignment, then the resource table contents as viewed by the kernel +loader would "shift" and look corrupted. + +ld/ChangeLog: + + * scripttempl/pru.sc (.resource_table): Align the output + section, not the first symbol. + +Signed-off-by: Dimitar Dimitrov +(cherry picked from commit 5109a7bd9b87bdad530f2ebf97036e6087b4504d) +--- + ld/ChangeLog | 5 +++++ + ld/scripttempl/pru.sc | 7 +++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +--- a/ld/ChangeLog ++++ b/ld/ChangeLog +@@ -1,3 +1,8 @@ ++2021-09-30 Dimitar Dimitrov ++ ++ * scripttempl/pru.sc (.resource_table): Align the output ++ section, not the first symbol. ++ + 2021-07-18 Nick Clifton + + * 2.37 release. +--- a/ld/scripttempl/pru.sc ++++ b/ld/scripttempl/pru.sc +@@ -151,11 +151,10 @@ + ${RELOCATING+ PROVIDE (_data_end = .) ; } + } ${RELOCATING+ > dmem } + +- .resource_table ${RELOCATING-0} : ++ /* Linux remoteproc loader requires the resource_table section ++ start address to be aligned to 8 bytes. */ ++ .resource_table ${RELOCATING-0} ${RELOCATING+ ALIGN(8)} : + { +- /* Linux remoteproc loader requires the resource table address +- to be aligned to 8 bytes. */ +- ${RELOCATING+. = ALIGN(8);} + KEEP (*(.resource_table)) + } ${RELOCATING+ > dmem} + diff --git a/packages/binutils/2.37/0012-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch b/packages/binutils/2.37/0012-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch deleted file mode 100644 index f7b5221..0000000 --- a/packages/binutils/2.37/0012-pr28391-strip-objcopy-preserve-dates-a-cannot-set-time.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6b02746a0e29b1007efd4feb137e2da3e681fc68 Mon Sep 17 00:00:00 2001 -From: Gleb Fotengauer-Malinovskiy -Date: Tue, 28 Sep 2021 20:11:26 +0930 -Subject: [PATCH] PR28391, strip/objcopy --preserve-dates *.a: cannot set time - -After commit 985e0264516 copy_archive function began to pass invalid -values to the utimensat(2) function when it tries to preserve -timestamps in ar archives. This happens because the bfd_stat_arch_elt -implementation for ar archives fills only the st_mtim.tv_sec part of -the st_mtim timespec structure, but leaves the st_mtim.tv_nsec part -and the whole st_atim timespec untouched leaving them uninitialized - - PR 28391 - * ar.c (extract_file): Clear buf for preserve_dates. - * objcopy.c (copy_archive): Likewise. - -(cherry picked from commit 0d62064867c74286360e821b75ef6799bedc4b34) ---- - binutils/ar.c | 3 +++ - binutils/objcopy.c | 1 + - 2 files changed, 4 insertions(+) - -diff --git a/binutils/ar.c b/binutils/ar.c -index 5d6976c7027..8885585ef75 100644 ---- a/binutils/ar.c -+++ b/binutils/ar.c -@@ -1180,6 +1180,9 @@ extract_file (bfd *abfd) - bfd_size_type size; - struct stat buf; - -+ if (preserve_dates) -+ memset (&buf, 0, sizeof (buf)); -+ - if (bfd_stat_arch_elt (abfd, &buf) != 0) - /* xgettext:c-format */ - fatal (_("internal stat error on %s"), bfd_get_filename (abfd)); -diff --git a/binutils/objcopy.c b/binutils/objcopy.c -index a6c2e0dcc26..fd7557fe433 100644 ---- a/binutils/objcopy.c -+++ b/binutils/objcopy.c -@@ -3600,6 +3600,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, - - if (preserve_dates) - { -+ memset (&buf, 0, sizeof (buf)); - stat_status = bfd_stat_arch_elt (this_element, &buf); - - if (stat_status != 0) --- -2.27.0 - diff --git a/packages/binutils/2.37/0013-ld-pru-fix-resource_table-output-section-alignment.patch b/packages/binutils/2.37/0013-ld-pru-fix-resource_table-output-section-alignment.patch deleted file mode 100644 index 58921f1..0000000 --- a/packages/binutils/2.37/0013-ld-pru-fix-resource_table-output-section-alignment.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a9c3934f6cb4407c5aaae82ada3b859d8ca9df83 Mon Sep 17 00:00:00 2001 -From: Dimitar Dimitrov -Date: Mon, 27 Sep 2021 22:43:24 +0300 -Subject: [PATCH] ld: pru: Fix resource_table output section alignment - -My commit 261980de18b added alignment for the resource table symbol. -But it is wrong. The Linux remoteproc driver loads and interprets the -contents of the .resource_table ELF section, not of a table symbol. - -Without this patch, if the linker happens to output padding for symbol -alignment, then the resource table contents as viewed by the kernel -loader would "shift" and look corrupted. - -ld/ChangeLog: - - * scripttempl/pru.sc (.resource_table): Align the output - section, not the first symbol. - -Signed-off-by: Dimitar Dimitrov -(cherry picked from commit 5109a7bd9b87bdad530f2ebf97036e6087b4504d) ---- - ld/ChangeLog | 5 +++++ - ld/scripttempl/pru.sc | 7 +++---- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/ld/ChangeLog b/ld/ChangeLog -index 5048b5b6a17..ee3259a06de 100644 ---- a/ld/ChangeLog -+++ b/ld/ChangeLog -@@ -1,3 +1,8 @@ -+2021-09-30 Dimitar Dimitrov -+ -+ * scripttempl/pru.sc (.resource_table): Align the output -+ section, not the first symbol. -+ - 2021-07-18 Nick Clifton - - * 2.37 release. -diff --git a/ld/scripttempl/pru.sc b/ld/scripttempl/pru.sc -index b2c941b7911..97d8be0a0a4 100644 ---- a/ld/scripttempl/pru.sc -+++ b/ld/scripttempl/pru.sc -@@ -151,11 +151,10 @@ SECTIONS - ${RELOCATING+ PROVIDE (_data_end = .) ; } - } ${RELOCATING+ > dmem } - -- .resource_table ${RELOCATING-0} : -+ /* Linux remoteproc loader requires the resource_table section -+ start address to be aligned to 8 bytes. */ -+ .resource_table ${RELOCATING-0} ${RELOCATING+ ALIGN(8)} : - { -- /* Linux remoteproc loader requires the resource table address -- to be aligned to 8 bytes. */ -- ${RELOCATING+. = ALIGN(8);} - KEEP (*(.resource_table)) - } ${RELOCATING+ > dmem} - --- -2.27.0 - diff --git a/packages/binutils/2.37/0013-pr28422-build_id-use-after-free.patch b/packages/binutils/2.37/0013-pr28422-build_id-use-after-free.patch new file mode 100644 index 0000000..97308ca --- /dev/null +++ b/packages/binutils/2.37/0013-pr28422-build_id-use-after-free.patch @@ -0,0 +1,26 @@ +From c20c7adbeaa3af18a58ba1e20e6c33e7186356e3 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Wed, 6 Oct 2021 18:28:47 +1030 +Subject: [PATCH] PR28422, build_id use-after-free + +This fixes a bug in commit 5d9bbb73c1df. All fields preserved from a +bfd in struct bfd_preserve need to be cleared in bfd_reinit. + + PR 28422 + * format.c (bfd_reinit): Clear build_id. + +(cherry picked from commit 6d661cdc5be46e890ed9255e749806f46a88e26c) +--- + bfd/format.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/bfd/format.c ++++ b/bfd/format.c +@@ -151,6 +151,7 @@ + abfd->tdata.any = NULL; + abfd->arch_info = &bfd_default_arch_struct; + abfd->flags &= BFD_FLAGS_SAVED; ++ abfd->build_id = NULL; + bfd_section_list_clear (abfd); + } + diff --git a/packages/binutils/2.37/0014-pr28422-build_id-use-after-free.patch b/packages/binutils/2.37/0014-pr28422-build_id-use-after-free.patch deleted file mode 100644 index 5f6c81a..0000000 --- a/packages/binutils/2.37/0014-pr28422-build_id-use-after-free.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c20c7adbeaa3af18a58ba1e20e6c33e7186356e3 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 6 Oct 2021 18:28:47 +1030 -Subject: [PATCH] PR28422, build_id use-after-free - -This fixes a bug in commit 5d9bbb73c1df. All fields preserved from a -bfd in struct bfd_preserve need to be cleared in bfd_reinit. - - PR 28422 - * format.c (bfd_reinit): Clear build_id. - -(cherry picked from commit 6d661cdc5be46e890ed9255e749806f46a88e26c) ---- - bfd/format.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/bfd/format.c b/bfd/format.c -index 5d08d1d642c..408c984690e 100644 ---- a/bfd/format.c -+++ b/bfd/format.c -@@ -151,6 +151,7 @@ bfd_reinit (bfd *abfd, unsigned int section_id, bfd_cleanup cleanup) - abfd->tdata.any = NULL; - abfd->arch_info = &bfd_default_arch_struct; - abfd->flags &= BFD_FLAGS_SAVED; -+ abfd->build_id = NULL; - bfd_section_list_clear (abfd); - } - --- -2.27.0 - diff --git a/packages/binutils/2.37/0014-pr28459-readelf-issues-bogus-warning.patch b/packages/binutils/2.37/0014-pr28459-readelf-issues-bogus-warning.patch new file mode 100644 index 0000000..0a1d6d7 --- /dev/null +++ b/packages/binutils/2.37/0014-pr28459-readelf-issues-bogus-warning.patch @@ -0,0 +1,35 @@ +From 61b08178e4cafca911bf909f54f8c373f16f0a70 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Sun, 17 Oct 2021 17:34:46 +1030 +Subject: [PATCH] PR28459, readelf issues bogus warning + +I'd missed the fact that the .debug_rnglists dump doesn't exactly +display the contents of the section. Instead readelf rummages through +.debug_info looking for DW_AT_ranges entries, then displays the +entries in .debug_rnglists pointed at, sorted. A simpler dump of the +actual section contents might be more useful and robust, but it was +likely done that way to detect overlap and holes. + +Anyway, the headers in .debug_rnglists besides the first are ignored, +and limiting to the unit length of the first header fails if there is +more than one unit. + + PR 28459 + * dwarf.c (display_debug_ranges): Don't constrain data to length + in header. + +(cherry picked from commit e7f024765a48fba4452535a5fc006a7e858730fd) +--- + binutils/dwarf.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/binutils/dwarf.c ++++ b/binutils/dwarf.c +@@ -7727,7 +7727,6 @@ + return 0; + } + } +- finish = start + initial_length; + + /* Get and check the version number. */ + SAFE_BYTE_GET_AND_INC (version, start, 2, finish); diff --git a/packages/binutils/2.37/0015-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch b/packages/binutils/2.37/0015-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch new file mode 100644 index 0000000..f26591e --- /dev/null +++ b/packages/binutils/2.37/0015-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch @@ -0,0 +1,38 @@ +From 0effb90eb7c9a50408d98ce174f1b4bc5562f017 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Wed, 20 Oct 2021 10:09:57 +1030 +Subject: [PATCH] PR28417, std::string no longer allows accepting nullptr_t + + PR 28417 + * incremental.cc (Sized_relobj_incr::do_section_name): Avoid + std:string undefined behaviour. + * options.h (Search_directory::Search_directory): Likewise. + +(cherry picked from commit 068a039b8bd7c7386bb0d88f0ae245b0fe4132e9) +--- + gold/incremental.cc | 2 +- + gold/options.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/gold/incremental.cc ++++ b/gold/incremental.cc +@@ -2280,7 +2280,7 @@ + const Output_sections& out_sections(this->output_sections()); + const Output_section* os = out_sections[shndx]; + if (os == NULL) +- return NULL; ++ return std::string(); + return os->name(); + } + +--- a/gold/options.h ++++ b/gold/options.h +@@ -611,7 +611,7 @@ + // We need a default constructor because we put this in a + // std::vector. + Search_directory() +- : name_(NULL), put_in_sysroot_(false), is_in_sysroot_(false) ++ : name_(), put_in_sysroot_(false), is_in_sysroot_(false) + { } + + // This is the usual constructor. diff --git a/packages/binutils/2.37/0015-pr28459-readelf-issues-bogus-warning.patch b/packages/binutils/2.37/0015-pr28459-readelf-issues-bogus-warning.patch deleted file mode 100644 index a860029..0000000 --- a/packages/binutils/2.37/0015-pr28459-readelf-issues-bogus-warning.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 61b08178e4cafca911bf909f54f8c373f16f0a70 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Sun, 17 Oct 2021 17:34:46 +1030 -Subject: [PATCH] PR28459, readelf issues bogus warning - -I'd missed the fact that the .debug_rnglists dump doesn't exactly -display the contents of the section. Instead readelf rummages through -.debug_info looking for DW_AT_ranges entries, then displays the -entries in .debug_rnglists pointed at, sorted. A simpler dump of the -actual section contents might be more useful and robust, but it was -likely done that way to detect overlap and holes. - -Anyway, the headers in .debug_rnglists besides the first are ignored, -and limiting to the unit length of the first header fails if there is -more than one unit. - - PR 28459 - * dwarf.c (display_debug_ranges): Don't constrain data to length - in header. - -(cherry picked from commit e7f024765a48fba4452535a5fc006a7e858730fd) ---- - binutils/dwarf.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/binutils/dwarf.c b/binutils/dwarf.c -index 1e7f4db7b7c..e73078f496f 100644 ---- a/binutils/dwarf.c -+++ b/binutils/dwarf.c -@@ -7727,7 +7727,6 @@ display_debug_ranges (struct dwarf_section *section, - return 0; - } - } -- finish = start + initial_length; - - /* Get and check the version number. */ - SAFE_BYTE_GET_AND_INC (version, start, 2, finish); --- -2.27.0 - diff --git a/packages/binutils/2.37/0016-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch b/packages/binutils/2.37/0016-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch deleted file mode 100644 index 7fa92df..0000000 --- a/packages/binutils/2.37/0016-pr28417-std-string-no-longer-allows-accepting-nullptr_t.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0effb90eb7c9a50408d98ce174f1b4bc5562f017 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Wed, 20 Oct 2021 10:09:57 +1030 -Subject: [PATCH] PR28417, std::string no longer allows accepting nullptr_t - - PR 28417 - * incremental.cc (Sized_relobj_incr::do_section_name): Avoid - std:string undefined behaviour. - * options.h (Search_directory::Search_directory): Likewise. - -(cherry picked from commit 068a039b8bd7c7386bb0d88f0ae245b0fe4132e9) ---- - gold/incremental.cc | 2 +- - gold/options.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gold/incremental.cc b/gold/incremental.cc -index 52941985e6f..327a1527a29 100644 ---- a/gold/incremental.cc -+++ b/gold/incremental.cc -@@ -2286,7 +2286,7 @@ Sized_relobj_incr::do_section_name(unsigned int shndx) const - const Output_sections& out_sections(this->output_sections()); - const Output_section* os = out_sections[shndx]; - if (os == NULL) -- return NULL; -+ return std::string(); - return os->name(); - } - -diff --git a/gold/options.h b/gold/options.h -index 757ebf18fec..47299a37834 100644 ---- a/gold/options.h -+++ b/gold/options.h -@@ -611,7 +611,7 @@ class Search_directory - // We need a default constructor because we put this in a - // std::vector. - Search_directory() -- : name_(NULL), put_in_sysroot_(false), is_in_sysroot_(false) -+ : name_(), put_in_sysroot_(false), is_in_sysroot_(false) - { } - - // This is the usual constructor. --- -2.27.0 - diff --git a/packages/binutils/2.37/0016-pr28540-segmentation-fault-on-NULL-byte_get.patch b/packages/binutils/2.37/0016-pr28540-segmentation-fault-on-NULL-byte_get.patch new file mode 100644 index 0000000..e0be9b7 --- /dev/null +++ b/packages/binutils/2.37/0016-pr28540-segmentation-fault-on-NULL-byte_get.patch @@ -0,0 +1,25 @@ +From 96eb21265ebffbc28f767bed9a2b7650ecb9818d Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Thu, 4 Nov 2021 14:11:02 +1030 +Subject: [PATCH] PR28540, segmentation fault on NULL byte_get + + PR 28540 + * objdump.c (dump_bfd): Don't attempt load_separate_debug_files + when byte_get is NULL. + +(cherry picked from commit f2f105f518413ea3e4c212f89585f9a8a5dddcdd) +--- + binutils/objdump.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/binutils/objdump.c ++++ b/binutils/objdump.c +@@ -4869,7 +4869,7 @@ + + The test on is_mainfile is there because the chain of separate debug + info files is a global variable shared by all invocations of dump_bfd. */ +- if (is_mainfile) ++ if (byte_get != NULL && is_mainfile) + { + load_separate_debug_files (abfd, bfd_get_filename (abfd)); + diff --git a/packages/binutils/2.37/0017-gold-place-note-gnu-property-section-before-other-note-sections.patch b/packages/binutils/2.37/0017-gold-place-note-gnu-property-section-before-other-note-sections.patch new file mode 100644 index 0000000..0063e0d --- /dev/null +++ b/packages/binutils/2.37/0017-gold-place-note-gnu-property-section-before-other-note-sections.patch @@ -0,0 +1,50 @@ +From bd711d6329ebb9328a99bd4be501932082248e44 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Mon, 25 Oct 2021 08:42:24 -0700 +Subject: [PATCH] gold: Place .note.gnu.property section before other note + sections + +Place the .note.gnu.property section before all other note sections to +avoid being placed between other note sections with different alignments. + + PR gold/28494 + * layout.cc (Layout::create_note): Set order to ORDER_PROPERTY_NOTE + for the .note.gnu.property section. + * layout.h (Output_section_order): Add ORDER_PROPERTY_NOTE. + +(cherry picked from commit f85dcfc3af9cf7c2859241253f1d37b1133abea2) +--- + gold/layout.cc | 3 ++- + gold/layout.h | 9 +++++++-- + 2 files changed, 9 insertions(+), 3 deletions(-) + +--- a/gold/layout.cc ++++ b/gold/layout.cc +@@ -3245,7 +3245,8 @@ + if (allocate) + { + flags = elfcpp::SHF_ALLOC; +- order = ORDER_RO_NOTE; ++ order = (note_type == elfcpp::NT_GNU_PROPERTY_TYPE_0 ++ ? ORDER_PROPERTY_NOTE : ORDER_RO_NOTE); + } + Output_section* os = this->choose_output_section(NULL, section_name, + elfcpp::SHT_NOTE, +--- a/gold/layout.h ++++ b/gold/layout.h +@@ -399,8 +399,13 @@ + // linker can pick it up quickly. + ORDER_INTERP, + +- // Loadable read-only note sections come next so that the PT_NOTE +- // segment is on the first page of the executable. ++ // The .note.gnu.property section comes next so that the PT_NOTE ++ // segment is on the first page of the executable and it won't be ++ // placed between other note sections with different alignments. ++ ORDER_PROPERTY_NOTE, ++ ++ // Loadable read-only note sections come after the .note.gnu.property ++ // section. + ORDER_RO_NOTE, + + // Put read-only sections used by the dynamic linker early in the diff --git a/packages/binutils/2.37/0017-pr28540-segmentation-fault-on-NULL-byte_get.patch b/packages/binutils/2.37/0017-pr28540-segmentation-fault-on-NULL-byte_get.patch deleted file mode 100644 index f7f26a7..0000000 --- a/packages/binutils/2.37/0017-pr28540-segmentation-fault-on-NULL-byte_get.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 96eb21265ebffbc28f767bed9a2b7650ecb9818d Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Thu, 4 Nov 2021 14:11:02 +1030 -Subject: [PATCH] PR28540, segmentation fault on NULL byte_get - - PR 28540 - * objdump.c (dump_bfd): Don't attempt load_separate_debug_files - when byte_get is NULL. - -(cherry picked from commit f2f105f518413ea3e4c212f89585f9a8a5dddcdd) ---- - binutils/objdump.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/binutils/objdump.c b/binutils/objdump.c -index a7b8303b992..50317b3d48f 100644 ---- a/binutils/objdump.c -+++ b/binutils/objdump.c -@@ -4869,7 +4869,7 @@ dump_bfd (bfd *abfd, bool is_mainfile) - - The test on is_mainfile is there because the chain of separate debug - info files is a global variable shared by all invocations of dump_bfd. */ -- if (is_mainfile) -+ if (byte_get != NULL && is_mainfile) - { - load_separate_debug_files (abfd, bfd_get_filename (abfd)); - --- -2.27.0 - diff --git a/packages/binutils/2.37/0018-gold-place-note-gnu-property-section-before-other-note-sections.patch b/packages/binutils/2.37/0018-gold-place-note-gnu-property-section-before-other-note-sections.patch deleted file mode 100644 index 9b53a90..0000000 --- a/packages/binutils/2.37/0018-gold-place-note-gnu-property-section-before-other-note-sections.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bd711d6329ebb9328a99bd4be501932082248e44 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 25 Oct 2021 08:42:24 -0700 -Subject: [PATCH] gold: Place .note.gnu.property section before other note - sections - -Place the .note.gnu.property section before all other note sections to -avoid being placed between other note sections with different alignments. - - PR gold/28494 - * layout.cc (Layout::create_note): Set order to ORDER_PROPERTY_NOTE - for the .note.gnu.property section. - * layout.h (Output_section_order): Add ORDER_PROPERTY_NOTE. - -(cherry picked from commit f85dcfc3af9cf7c2859241253f1d37b1133abea2) ---- - gold/layout.cc | 3 ++- - gold/layout.h | 9 +++++++-- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/gold/layout.cc b/gold/layout.cc -index a27cb071c75..38e9bceec7e 100644 ---- a/gold/layout.cc -+++ b/gold/layout.cc -@@ -3245,7 +3245,8 @@ Layout::create_note(const char* name, int note_type, - if (allocate) - { - flags = elfcpp::SHF_ALLOC; -- order = ORDER_RO_NOTE; -+ order = (note_type == elfcpp::NT_GNU_PROPERTY_TYPE_0 -+ ? ORDER_PROPERTY_NOTE : ORDER_RO_NOTE); - } - Output_section* os = this->choose_output_section(NULL, section_name, - elfcpp::SHT_NOTE, -diff --git a/gold/layout.h b/gold/layout.h -index 0b378003679..05c31714e47 100644 ---- a/gold/layout.h -+++ b/gold/layout.h -@@ -399,8 +399,13 @@ enum Output_section_order - // linker can pick it up quickly. - ORDER_INTERP, - -- // Loadable read-only note sections come next so that the PT_NOTE -- // segment is on the first page of the executable. -+ // The .note.gnu.property section comes next so that the PT_NOTE -+ // segment is on the first page of the executable and it won't be -+ // placed between other note sections with different alignments. -+ ORDER_PROPERTY_NOTE, -+ -+ // Loadable read-only note sections come after the .note.gnu.property -+ // section. - ORDER_RO_NOTE, - - // Put read-only sections used by the dynamic linker early in the --- -2.27.0 - diff --git a/packages/binutils/2.37/0018-waddress-warning-in-ldelf.c.patch b/packages/binutils/2.37/0018-waddress-warning-in-ldelf.c.patch new file mode 100644 index 0000000..685af62 --- /dev/null +++ b/packages/binutils/2.37/0018-waddress-warning-in-ldelf.c.patch @@ -0,0 +1,31 @@ +From c912b88e003a43e10020f56675fbd7e180d255ab Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Thu, 21 Oct 2021 19:18:34 +1030 +Subject: [PATCH] -Waddress warning in ldelf.c + +ldelf.c: In function 'ldelf_after_open': +ldelf.c:1049:43: warning: the comparison will always evaluate as 'true' for the address of 'elf_header' will never be NULL [-Waddress] + 1049 | && elf_tdata (abfd)->elf_header != NULL + | ^~ +In file included from ldelf.c:37: +../bfd/elf-bfd.h:1957:21: note: 'elf_header' declared here + 1957 | Elf_Internal_Ehdr elf_header[1]; /* Actual data, but ref like ptr */ + + PR ld/28734 + * ldelf.c (ldelf_after_open): Remove useless elf_header test. + +(cherry picked from commit ced10cb78d01652f9e1bb1d1e465327dfe1debaa) +--- + ld/ldelf.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/ld/ldelf.c ++++ b/ld/ldelf.c +@@ -1046,7 +1046,6 @@ + if (abfd->xvec->flavour == bfd_target_elf_flavour + && !bfd_input_just_syms (abfd) + && elf_tdata (abfd) != NULL +- && elf_tdata (abfd)->elf_header != NULL + /* FIXME: Maybe check for other non-supportable types as well ? */ + && (elf_tdata (abfd)->elf_header->e_type == ET_EXEC + || (elf_tdata (abfd)->elf_header->e_type == ET_DYN diff --git a/packages/binutils/2.37/0019-waddress-warning-in-ldelf.c.patch b/packages/binutils/2.37/0019-waddress-warning-in-ldelf.c.patch deleted file mode 100644 index 4091806..0000000 --- a/packages/binutils/2.37/0019-waddress-warning-in-ldelf.c.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c912b88e003a43e10020f56675fbd7e180d255ab Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Thu, 21 Oct 2021 19:18:34 +1030 -Subject: [PATCH] -Waddress warning in ldelf.c - -ldelf.c: In function 'ldelf_after_open': -ldelf.c:1049:43: warning: the comparison will always evaluate as 'true' for the address of 'elf_header' will never be NULL [-Waddress] - 1049 | && elf_tdata (abfd)->elf_header != NULL - | ^~ -In file included from ldelf.c:37: -../bfd/elf-bfd.h:1957:21: note: 'elf_header' declared here - 1957 | Elf_Internal_Ehdr elf_header[1]; /* Actual data, but ref like ptr */ - - PR ld/28734 - * ldelf.c (ldelf_after_open): Remove useless elf_header test. - -(cherry picked from commit ced10cb78d01652f9e1bb1d1e465327dfe1debaa) ---- - ld/ldelf.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/ld/ldelf.c b/ld/ldelf.c -index 21e655bb55c..0c39eb6024f 100644 ---- a/ld/ldelf.c -+++ b/ld/ldelf.c -@@ -1046,7 +1046,6 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd, - if (abfd->xvec->flavour == bfd_target_elf_flavour - && !bfd_input_just_syms (abfd) - && elf_tdata (abfd) != NULL -- && elf_tdata (abfd)->elf_header != NULL - /* FIXME: Maybe check for other non-supportable types as well ? */ - && (elf_tdata (abfd)->elf_header->e_type == ET_EXEC - || (elf_tdata (abfd)->elf_header->e_type == ET_DYN --- -2.27.0 - diff --git a/packages/duma/2_5_15/0003-cpp17_throw.patch b/packages/duma/2_5_15/0003-cpp17_throw.patch new file mode 100644 index 0000000..f468c5d --- /dev/null +++ b/packages/duma/2_5_15/0003-cpp17_throw.patch @@ -0,0 +1,73 @@ +--- + testoperators.cpp | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +--- a/testoperators.cpp ++++ b/testoperators.cpp +@@ -37,26 +37,26 @@ + { + public: + /* 1x : SINGLE OBJECT FORM - NO DEBUG INFORMATION */ +- void * operator new( DUMA_SIZE_T ) throw(std::bad_alloc); ++ void * operator new( DUMA_SIZE_T ) NEW_THROW_SPEC; + void * operator new( DUMA_SIZE_T , const std::nothrow_t & ) throw(); + void operator delete( void * ) throw(); + void operator delete( void * , const std::nothrow_t & ) throw(); + + /* 2x : ARRAY OBJECT FORM - NO DEBUG INFORMATION */ +- void * operator new[]( DUMA_SIZE_T ) throw(std::bad_alloc); ++ void * operator new[]( DUMA_SIZE_T ) NEW_THROW_SPEC; + void * operator new[]( DUMA_SIZE_T , const std::nothrow_t & ) throw(); + void operator delete[]( void * ) throw(); + void operator delete[]( void *, const std::nothrow_t & ) throw(); + + #ifndef DUMA_NO_LEAKDETECTION + /* 3x : SINGLE OBJECT FORM - WITH DEBUG INFORMATION */ +- void * operator new( DUMA_SIZE_T, const char *, int ) throw( std::bad_alloc ); ++ void * operator new( DUMA_SIZE_T, const char *, int ) NEW_THROW_SPEC; + void * operator new( DUMA_SIZE_T, const std::nothrow_t &, const char *, int ) throw(); + void operator delete( void *, const char *, int ) throw(); + void operator delete( void *, const std::nothrow_t &, const char *, int ) throw(); + + /* 4x : ARRAY OBJECT FORM - WITH DEBUG INFORMATION */ +- void * operator new[]( DUMA_SIZE_T, const char *, int ) throw( std::bad_alloc ); ++ void * operator new[]( DUMA_SIZE_T, const char *, int ) NEW_THROW_SPEC; + void * operator new[]( DUMA_SIZE_T, const std::nothrow_t &, const char *, int ) throw(); + void operator delete[]( void *, const char *, int ) throw(); + void operator delete[]( void *, const std::nothrow_t &, const char *, int ) throw(); +@@ -70,7 +70,7 @@ + /* 1x : SINGLE OBJECT FORM - NO DEBUG INFORMATION */ + + void * optest::operator new( DUMA_SIZE_T s ) +-throw(std::bad_alloc) ++NEW_THROW_SPEC + { + (void)s; + return ::new optest; +@@ -101,7 +101,7 @@ + + /* 2x : ARRAY OBJECT FORM - NO DEBUG INFORMATION */ + void * optest::operator new[]( DUMA_SIZE_T s ) +-throw(std::bad_alloc) ++NEW_THROW_SPEC + { + return ::new optest[ s / sizeof(optest) ]; // "s / sizeof()" not correct but works for this test + } +@@ -129,7 +129,7 @@ + + /* 3x : SINGLE OBJECT FORM - WITH DEBUG INFORMATION */ + void * optest::operator new( DUMA_SIZE_T s, const char * f, int l ) +-throw( std::bad_alloc ) ++NEW_THROW_SPEC + { + (void)s; + return ::new(f,l) optest; +@@ -157,7 +157,7 @@ + + /* 4x : ARRAY OBJECT FORM - WITH DEBUG INFORMATION */ + void * optest::operator new[]( DUMA_SIZE_T s, const char * f, int l ) +-throw( std::bad_alloc ) ++NEW_THROW_SPEC + { + return ::new(f,l) optest[s / sizeof(optest)]; // "s / sizeof()" not correct but works for this test + } diff --git a/packages/duma/2_5_15/0003_cpp17_throw.patch b/packages/duma/2_5_15/0003_cpp17_throw.patch deleted file mode 100644 index d61bd49..0000000 --- a/packages/duma/2_5_15/0003_cpp17_throw.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- a/testoperators.cpp 2009-03-17 16:04:43.000000000 -0700 -+++ b/testoperators.cpp 2021-05-01 01:15:25.385421628 -0700 -@@ -37,26 +37,26 @@ - { - public: - /* 1x : SINGLE OBJECT FORM - NO DEBUG INFORMATION */ -- void * operator new( DUMA_SIZE_T ) throw(std::bad_alloc); -+ void * operator new( DUMA_SIZE_T ) NEW_THROW_SPEC; - void * operator new( DUMA_SIZE_T , const std::nothrow_t & ) throw(); - void operator delete( void * ) throw(); - void operator delete( void * , const std::nothrow_t & ) throw(); - - /* 2x : ARRAY OBJECT FORM - NO DEBUG INFORMATION */ -- void * operator new[]( DUMA_SIZE_T ) throw(std::bad_alloc); -+ void * operator new[]( DUMA_SIZE_T ) NEW_THROW_SPEC; - void * operator new[]( DUMA_SIZE_T , const std::nothrow_t & ) throw(); - void operator delete[]( void * ) throw(); - void operator delete[]( void *, const std::nothrow_t & ) throw(); - - #ifndef DUMA_NO_LEAKDETECTION - /* 3x : SINGLE OBJECT FORM - WITH DEBUG INFORMATION */ -- void * operator new( DUMA_SIZE_T, const char *, int ) throw( std::bad_alloc ); -+ void * operator new( DUMA_SIZE_T, const char *, int ) NEW_THROW_SPEC; - void * operator new( DUMA_SIZE_T, const std::nothrow_t &, const char *, int ) throw(); - void operator delete( void *, const char *, int ) throw(); - void operator delete( void *, const std::nothrow_t &, const char *, int ) throw(); - - /* 4x : ARRAY OBJECT FORM - WITH DEBUG INFORMATION */ -- void * operator new[]( DUMA_SIZE_T, const char *, int ) throw( std::bad_alloc ); -+ void * operator new[]( DUMA_SIZE_T, const char *, int ) NEW_THROW_SPEC; - void * operator new[]( DUMA_SIZE_T, const std::nothrow_t &, const char *, int ) throw(); - void operator delete[]( void *, const char *, int ) throw(); - void operator delete[]( void *, const std::nothrow_t &, const char *, int ) throw(); -@@ -70,7 +70,7 @@ - /* 1x : SINGLE OBJECT FORM - NO DEBUG INFORMATION */ - - void * optest::operator new( DUMA_SIZE_T s ) --throw(std::bad_alloc) -+NEW_THROW_SPEC - { - (void)s; - return ::new optest; -@@ -101,7 +101,7 @@ - - /* 2x : ARRAY OBJECT FORM - NO DEBUG INFORMATION */ - void * optest::operator new[]( DUMA_SIZE_T s ) --throw(std::bad_alloc) -+NEW_THROW_SPEC - { - return ::new optest[ s / sizeof(optest) ]; // "s / sizeof()" not correct but works for this test - } -@@ -129,7 +129,7 @@ - - /* 3x : SINGLE OBJECT FORM - WITH DEBUG INFORMATION */ - void * optest::operator new( DUMA_SIZE_T s, const char * f, int l ) --throw( std::bad_alloc ) -+NEW_THROW_SPEC - { - (void)s; - return ::new(f,l) optest; -@@ -157,7 +157,7 @@ - - /* 4x : ARRAY OBJECT FORM - WITH DEBUG INFORMATION */ - void * optest::operator new[]( DUMA_SIZE_T s, const char * f, int l ) --throw( std::bad_alloc ) -+NEW_THROW_SPEC - { - return ::new(f,l) optest[s / sizeof(optest)]; // "s / sizeof()" not correct but works for this test - } diff --git a/packages/gcc/10.3.0/0000-libtool-leave-framework-alone.patch b/packages/gcc/10.3.0/0000-libtool-leave-framework-alone.patch index b5804ea..1a86e41 100644 --- a/packages/gcc/10.3.0/0000-libtool-leave-framework-alone.patch +++ b/packages/gcc/10.3.0/0000-libtool-leave-framework-alone.patch @@ -4,7 +4,7 @@ --- a/libtool-ldflags +++ b/libtool-ldflags -@@ -36,6 +36,11 @@ prev_arg= +@@ -36,6 +36,11 @@ for arg do case $arg in diff --git a/packages/gcc/10.3.0/0001-uclibc-conf.patch b/packages/gcc/10.3.0/0001-uclibc-conf.patch index a9ae872..aef750a 100644 --- a/packages/gcc/10.3.0/0001-uclibc-conf.patch +++ b/packages/gcc/10.3.0/0001-uclibc-conf.patch @@ -4,7 +4,7 @@ --- a/contrib/regression/objs-gcc.sh +++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H +@@ -106,6 +106,10 @@ then make all-gdb all-dejagnu all-ld || exit 1 make install-gdb install-dejagnu install-ld || exit 1 diff --git a/packages/gcc/10.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/10.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch index 394dd49..ca9b8ba 100644 --- a/packages/gcc/10.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch +++ b/packages/gcc/10.3.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch @@ -6,7 +6,7 @@ --- a/config/gcc-plugin.m4 +++ b/config/gcc-plugin.m4 -@@ -21,6 +21,9 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], +@@ -21,6 +21,9 @@ pluginlibs= plugin_check=yes @@ -16,7 +16,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -43,6 +46,11 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], +@@ -43,6 +46,11 @@ export_sym_check= fi ;; @@ -28,7 +28,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -94,17 +102,17 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], +@@ -94,17 +102,17 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` @@ -53,7 +53,7 @@ if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then --- a/gcc/configure +++ b/gcc/configure -@@ -30375,6 +30375,9 @@ fi +@@ -30385,6 +30385,9 @@ pluginlibs= plugin_check=yes @@ -63,7 +63,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -30397,6 +30400,11 @@ fi +@@ -30407,6 +30410,11 @@ export_sym_check= fi ;; @@ -75,7 +75,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -30509,23 +30517,23 @@ fi +@@ -30519,23 +30527,23 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` @@ -108,7 +108,7 @@ } --- a/libcc1/configure +++ b/libcc1/configure -@@ -14795,6 +14795,9 @@ fi +@@ -14812,6 +14812,9 @@ pluginlibs= plugin_check=yes @@ -118,7 +118,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -14817,6 +14820,11 @@ fi +@@ -14834,6 +14837,11 @@ export_sym_check= fi ;; @@ -130,7 +130,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -14929,23 +14937,23 @@ fi +@@ -14946,23 +14954,23 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` diff --git a/packages/gcc/10.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/10.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch index 3040e23..5f9a07a 100644 --- a/packages/gcc/10.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch +++ b/packages/gcc/10.3.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch @@ -4,7 +4,7 @@ --- a/libcc1/connection.cc +++ b/libcc1/connection.cc -@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. +@@ -21,6 +21,7 @@ #include #include #include diff --git a/packages/gcc/10.3.0/0005-fix-m68k-uclinux.patch b/packages/gcc/10.3.0/0005-fix-m68k-uclinux.patch index 9d176d3..452a4bb 100644 --- a/packages/gcc/10.3.0/0005-fix-m68k-uclinux.patch +++ b/packages/gcc/10.3.0/0005-fix-m68k-uclinux.patch @@ -10,7 +10,7 @@ Signed-off-by: Waldemar Brodkorb --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -949,7 +949,7 @@ m68k*-*-netbsdelf*) +@@ -949,7 +949,7 @@ m68k*-*-openbsd*) ;; m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc diff --git a/packages/gcc/10.3.0/0006-libgfortran-missing-include.patch b/packages/gcc/10.3.0/0006-libgfortran-missing-include.patch index 866d2cc..d4917ee 100644 --- a/packages/gcc/10.3.0/0006-libgfortran-missing-include.patch +++ b/packages/gcc/10.3.0/0006-libgfortran-missing-include.patch @@ -4,7 +4,7 @@ --- a/libgfortran/io/close.c +++ b/libgfortran/io/close.c -@@ -29,6 +29,7 @@ see the files COPYING3 and COPYING.RUNTI +@@ -29,6 +29,7 @@ #if !HAVE_UNLINK_OPEN_FILE #include #endif diff --git a/packages/gcc/10.3.0/0009-bionic-ndk.patch b/packages/gcc/10.3.0/0009-bionic-ndk.patch index 090172d..474dd8c 100644 --- a/packages/gcc/10.3.0/0009-bionic-ndk.patch +++ b/packages/gcc/10.3.0/0009-bionic-ndk.patch @@ -29,7 +29,7 @@ Date: Tue Apr 25 19:02:18 2017 -0700 namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -41,17 +53,17 @@ // NB: Offsets into ctype::_M_table force a particular size // on the mask type. Because of this, we don't use an enum. typedef char mask; diff --git a/packages/gcc/10.3.0/0010-crystax.patch b/packages/gcc/10.3.0/0010-crystax.patch index 98bd2fe..5b15ffb 100644 --- a/packages/gcc/10.3.0/0010-crystax.patch +++ b/packages/gcc/10.3.0/0010-crystax.patch @@ -37,7 +37,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -1083,14 +1083,18 @@ aarch64*-*-netbsd*) +@@ -1113,14 +1113,18 @@ extra_options="${extra_options} netbsd.opt netbsd-elf.opt" ;; aarch64*-*-linux*) @@ -57,7 +57,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 esac aarch64_multilibs="${with_multilib_list}" if test "$aarch64_multilibs" = "default"; then -@@ -2501,6 +2505,17 @@ mips*-*-linux*) # Linux MIPS, either +@@ -2532,6 +2536,17 @@ tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h" extra_options="${extra_options} linux-android.opt" case ${target} in @@ -157,7 +157,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h -@@ -1974,12 +1974,13 @@ enum arm_auto_incmodes +@@ -1974,12 +1974,13 @@ #define CASE_VECTOR_PC_RELATIVE ((TARGET_THUMB2 \ || (TARGET_THUMB1 \ @@ -174,7 +174,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 : min >= -256 && max < 256 \ --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md -@@ -9342,7 +9342,7 @@ +@@ -9346,7 +9346,7 @@ (match_operand:SI 2 "const_int_operand") ; total range (match_operand:SI 3 "" "") ; table label (match_operand:SI 4 "" "")] ; Out of range label @@ -185,7 +185,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 enum insn_code code; --- a/gcc/config/arm/arm.opt +++ b/gcc/config/arm/arm.opt -@@ -202,6 +202,10 @@ mthumb-interwork +@@ -202,6 +202,10 @@ Target Report Mask(INTERWORK) Support calls between Thumb and ARM instruction sets. @@ -250,7 +250,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC, \ --- a/gcc/config/i386/gnu-user.h +++ b/gcc/config/i386/gnu-user.h -@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3. +@@ -65,9 +65,14 @@ When the -shared link option is used a final link is not being done. */ @@ -268,7 +268,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #define SUBTARGET_EXTRA_SPECS \ --- a/gcc/config/i386/gnu-user64.h +++ b/gcc/config/i386/gnu-user64.h -@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTI +@@ -46,6 +46,11 @@ #define SPEC_X32 "mx32" #endif @@ -282,7 +282,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 %{" SPEC_64 ":--64} \ --- a/gcc/config/i386/linux-common.h +++ b/gcc/config/i386/linux-common.h -@@ -36,7 +36,13 @@ along with GCC; see the file COPYING3. +@@ -36,7 +36,13 @@ #undef CC1_SPEC #define CC1_SPEC \ LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \ @@ -377,7 +377,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 + LINUX_DRIVER_SELF_SPECS --- a/gcc/config/mips/gnu-user.h +++ b/gcc/config/mips/gnu-user.h -@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. +@@ -36,6 +36,7 @@ /* The GNU C++ standard library requires this. */ \ if (c_dialect_cxx ()) \ builtin_define ("_GNU_SOURCE"); \ @@ -385,7 +385,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 } while (0) #undef SUBTARGET_CPP_SPEC -@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3. +@@ -71,7 +72,8 @@ #undef SUBTARGET_ASM_SPEC #define SUBTARGET_ASM_SPEC \ @@ -395,7 +395,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 /* The MIPS assembler has different syntax for .set. We set it to .dummy to trap any errors. */ -@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu +@@ -120,7 +122,7 @@ #endif #define LINUX_DRIVER_SELF_SPECS \ @@ -406,7 +406,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 specs handling by removing a redundant option. */ \ --- a/gcc/config/mips/linux-common.h +++ b/gcc/config/mips/linux-common.h -@@ -38,7 +38,7 @@ along with GCC; see the file COPYING3. +@@ -38,7 +38,7 @@ #undef SUBTARGET_CC1_SPEC #define SUBTARGET_CC1_SPEC \ LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \ @@ -430,7 +430,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6 --- a/libgcc/gthr-posix.h +++ b/libgcc/gthr-posix.h -@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTI +@@ -32,6 +32,19 @@ #define __GTHREADS 1 #define __GTHREADS_CXX0X 1 @@ -452,7 +452,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \ --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -74306,6 +74306,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ +@@ -73677,6 +73677,18 @@ #include #include int lk; @@ -494,7 +494,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -@@ -1104,7 +1118,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1104,7 +1118,7 @@ * @return @a __hi. */ virtual const char* @@ -503,7 +503,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 { if (__builtin_expect(__hi != __lo, true)) __builtin_memcpy(__to, __lo, __hi - __lo); -@@ -1167,7 +1181,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1167,7 +1181,7 @@ private: void _M_narrow_init() const; diff --git a/packages/gcc/10.3.0/0012-crystax.patch b/packages/gcc/10.3.0/0012-crystax.patch index e7476ba..a61ec09 100644 --- a/packages/gcc/10.3.0/0012-crystax.patch +++ b/packages/gcc/10.3.0/0012-crystax.patch @@ -16,13 +16,12 @@ Date: Mon Apr 14 15:59:47 2014 -0700 gcc/config/freebsd.h | 4 +++ gcc/config/gnu-user.h | 4 +++ gcc/config/openbsd.h | 4 +++ - gcc/config/rs6000/sysv4.h | 6 ++++- gcc/config/sol2.h | 4 +++ gcc/configure | 36 +++++++++++++++++++++++++++++++++ gcc/configure.ac | 29 ++++++++++++++++++++++++++ gcc/testsuite/g++.dg/eh/spec3-static.C | 25 ++++++++++++++++++++++ libgcc/crtstuff.c | 11 ++++++---- - 11 files changed, 128 insertions(+), 5 deletions(-) + 10 files changed, 123 insertions(+), 4 deletions(-) --- a/gcc/config.in +++ b/gcc/config.in @@ -41,7 +40,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 #ifndef USED_FOR_TARGET --- a/gcc/config/alpha/elf.h +++ b/gcc/config/alpha/elf.h -@@ -142,5 +142,9 @@ extern int alpha_this_gpdisp_sequence_nu +@@ -142,5 +142,9 @@ I imagine that other systems will catch up. In the meantime, it doesn't harm to make sure that the data exists to be used later. */ #if defined(HAVE_LD_EH_FRAME_HDR) @@ -53,7 +52,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 +#endif --- a/gcc/config/freebsd.h +++ b/gcc/config/freebsd.h -@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3. +@@ -45,8 +45,12 @@ #define LIB_SPEC FBSD_LIB_SPEC #if defined(HAVE_LD_EH_FRAME_HDR) @@ -68,7 +67,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ --- a/gcc/config/gnu-user.h +++ b/gcc/config/gnu-user.h -@@ -106,8 +106,12 @@ see the files COPYING3 and COPYING.RUNTI +@@ -106,8 +106,12 @@ #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC #if defined(HAVE_LD_EH_FRAME_HDR) @@ -83,7 +82,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 "%{static|static-pie:--start-group} %G %{!nolibc:%L} \ --- a/gcc/config/openbsd.h +++ b/gcc/config/openbsd.h -@@ -136,8 +136,12 @@ while (0) +@@ -136,8 +136,12 @@ #define LIB_SPEC OBSD_LIB_SPEC #if defined(HAVE_LD_EH_FRAME_HDR) @@ -98,7 +97,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 #define LIB_SPEC OBSD_LIB_SPEC --- a/gcc/config/sol2.h +++ b/gcc/config/sol2.h -@@ -434,7 +434,11 @@ along with GCC; see the file COPYING3. +@@ -434,7 +434,11 @@ /* Solaris 11 build 135+ implements dl_iterate_phdr. GNU ld needs --eh-frame-hdr to create the required .eh_frame_hdr sections. */ #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) @@ -112,7 +111,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 --- a/gcc/configure +++ b/gcc/configure -@@ -1000,6 +1000,7 @@ enable_fix_cortex_a53_835769 +@@ -1000,6 +1000,7 @@ enable_fix_cortex_a53_843419 with_glibc_version enable_gnu_unique_object @@ -120,7 +119,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 enable_linker_build_id enable_libssp enable_default_ssp -@@ -1754,6 +1755,9 @@ Optional Features: +@@ -1754,6 +1755,9 @@ --enable-gnu-unique-object enable the use of the @gnu_unique_object ELF extension on glibc systems @@ -130,7 +129,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 --enable-linker-build-id compiler will always pass --build-id to linker --enable-libssp enable linking against libssp -@@ -28836,6 +28840,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xye +@@ -28843,6 +28847,38 @@ $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h @@ -171,7 +170,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; } --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -5371,6 +5371,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HD +@@ -5376,6 +5376,35 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1, [Define if your linker supports .eh_frame_hdr.]) @@ -237,7 +236,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 +} --- a/libgcc/crtstuff.c +++ b/libgcc/crtstuff.c -@@ -88,7 +88,8 @@ call_ ## FUNC (void) \ +@@ -88,7 +88,8 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) \ @@ -247,7 +246,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 && defined(BSD_DL_ITERATE_PHDR_AVAILABLE) #include # define USE_PT_GNU_EH_FRAME -@@ -97,7 +98,8 @@ call_ ## FUNC (void) \ +@@ -97,7 +98,8 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \ @@ -257,7 +256,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 && defined(__sun__) && defined(__svr4__) #include # define USE_PT_GNU_EH_FRAME -@@ -106,7 +108,8 @@ call_ ## FUNC (void) \ +@@ -106,7 +108,8 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) \ @@ -267,7 +266,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 && defined(__GLIBC__) && __GLIBC__ >= 2 #include /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h. -@@ -121,7 +124,7 @@ call_ ## FUNC (void) \ +@@ -121,7 +124,7 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) \ diff --git a/packages/gcc/10.3.0/0013-crystax.patch b/packages/gcc/10.3.0/0013-crystax.patch index 4414940..bf1bc1c 100644 --- a/packages/gcc/10.3.0/0013-crystax.patch +++ b/packages/gcc/10.3.0/0013-crystax.patch @@ -12,7 +12,7 @@ Date: Thu Aug 20 19:11:07 2015 +0300 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c -@@ -10344,6 +10344,7 @@ legitimate_pic_address_disp_p (rtx disp) +@@ -10340,6 +10340,7 @@ else if (!SYMBOL_REF_FAR_ADDR_P (op0) && (SYMBOL_REF_LOCAL_P (op0) || (HAVE_LD_PIE_COPYRELOC diff --git a/packages/gcc/10.3.0/0014-crystax.patch b/packages/gcc/10.3.0/0014-crystax.patch index 5acc6b9..8f2eb43 100644 --- a/packages/gcc/10.3.0/0014-crystax.patch +++ b/packages/gcc/10.3.0/0014-crystax.patch @@ -12,7 +12,7 @@ Date: Fri Aug 21 17:41:59 2015 +0300 --- a/libgcc/gthr.h +++ b/libgcc/gthr.h -@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTI +@@ -145,7 +145,11 @@ #define GTHREAD_USE_WEAK 1 #endif #endif diff --git a/packages/gcc/10.3.0/0015-crystax.patch b/packages/gcc/10.3.0/0015-crystax.patch index 1a4f6b3..4f1c28e 100644 --- a/packages/gcc/10.3.0/0015-crystax.patch +++ b/packages/gcc/10.3.0/0015-crystax.patch @@ -15,7 +15,7 @@ Date: Mon Apr 14 21:05:51 2014 -0700 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c -@@ -24077,9 +24077,13 @@ arm_print_operand (FILE *stream, rtx x, +@@ -24131,9 +24131,13 @@ memsize = MEM_SIZE (x); /* Only certain alignment specifiers are supported by the hardware. */ diff --git a/packages/gcc/10.3.0/0017-crystax.patch b/packages/gcc/10.3.0/0017-crystax.patch index 1a46aed..28284ff 100644 --- a/packages/gcc/10.3.0/0017-crystax.patch +++ b/packages/gcc/10.3.0/0017-crystax.patch @@ -24,7 +24,7 @@ Date: Tue Aug 25 09:36:42 2015 +0300 #endif /* GCC_AARCH64_LINUX_ANDROID_H */ --- a/gcc/config/mips/linux-common.h +++ b/gcc/config/mips/linux-common.h -@@ -65,3 +65,7 @@ along with GCC; see the file COPYING3. +@@ -65,3 +65,7 @@ /* The default value isn't sufficient in 64-bit mode. */ #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024) diff --git a/packages/gcc/10.3.0/0018-isl-0.20.patch b/packages/gcc/10.3.0/0018-isl-0.20.patch index de188b1..3e14966 100644 --- a/packages/gcc/10.3.0/0018-isl-0.20.patch +++ b/packages/gcc/10.3.0/0018-isl-0.20.patch @@ -15,7 +15,7 @@ Date: Mon Sep 24 22:50:11 2018 -0700 --- a/gcc/graphite.h +++ b/gcc/graphite.h -@@ -26,6 +26,8 @@ along with GCC; see the file COPYING3. +@@ -26,6 +26,8 @@ #include #include #include diff --git a/packages/gcc/10.3.0/0019-AArch64-Fix-build-issue-with-aarch64-builtins.c-on-M.patch b/packages/gcc/10.3.0/0019-AArch64-Fix-build-issue-with-aarch64-builtins.c-on-M.patch index a618707..0001169 100644 --- a/packages/gcc/10.3.0/0019-AArch64-Fix-build-issue-with-aarch64-builtins.c-on-M.patch +++ b/packages/gcc/10.3.0/0019-AArch64-Fix-build-issue-with-aarch64-builtins.c-on-M.patch @@ -13,14 +13,12 @@ Fix this by adding '-std=gnu++11' to the compile line. Signed-off-by: Kumar Gala --- - gcc/config/aarch64/t-aarch64 | 2 +- + gcc/config/aarch64/t-aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64 -index 11d20b7be14..d4c3154cf40 100644 --- a/gcc/config/aarch64/t-aarch64 +++ b/gcc/config/aarch64/t-aarch64 -@@ -41,7 +41,7 @@ aarch64-builtins.o: $(srcdir)/config/aarch64/aarch64-builtins.c $(CONFIG_H) \ +@@ -41,7 +41,7 @@ $(srcdir)/config/aarch64/aarch64-simd-builtins.def \ $(srcdir)/config/aarch64/aarch64-simd-builtin-types.def \ aarch64-builtin-iterators.h @@ -29,6 +27,3 @@ index 11d20b7be14..d4c3154cf40 100644 $(srcdir)/config/aarch64/aarch64-builtins.c aarch64-sve-builtins.o: $(srcdir)/config/aarch64/aarch64-sve-builtins.cc \ --- -2.25.4 - diff --git a/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch b/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch index da92ba3..7e3e6e6 100644 --- a/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch +++ b/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch @@ -28,17 +28,15 @@ libstdc++-v3/ChangeLog: * config.h.in: Regenerate. * configure: Regenerate. --- - libstdc++-v3/acinclude.m4 | 20 ++++++---- - libstdc++-v3/config.h.in | 3 ++ - libstdc++-v3/config/io/basic_file_stdio.cc | 46 +++++++++++++++++++--- - libstdc++-v3/configure | 17 +++++--- + libstdc++-v3/acinclude.m4 | 20 ++++++++---- + libstdc++-v3/config.h.in | 3 + + libstdc++-v3/config/io/basic_file_stdio.cc | 46 +++++++++++++++++++++++++---- + libstdc++-v3/configure | 17 +++++++--- 4 files changed, 69 insertions(+), 17 deletions(-) -diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 -index ee5e0336f2c..9604533c306 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 -@@ -2826,24 +2826,30 @@ AC_DEFUN([GLIBCXX_ENABLE_PARALLEL], [ +@@ -2797,24 +2797,30 @@ dnl @@ -76,11 +74,9 @@ index ee5e0336f2c..9604533c306 100644 ;; esac -diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in -index 8940e0c7acd..eabcf18b52b 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in -@@ -1031,6 +1031,9 @@ +@@ -974,6 +974,9 @@ /* Define if sendfile is available in . */ #undef _GLIBCXX_USE_SENDFILE @@ -90,11 +86,9 @@ index 8940e0c7acd..eabcf18b52b 100644 /* Define if struct stat has timespec members. */ #undef _GLIBCXX_USE_ST_MTIM -diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc -index ba830fb9e97..eedffb017b6 100644 --- a/libstdc++-v3/config/io/basic_file_stdio.cc +++ b/libstdc++-v3/config/io/basic_file_stdio.cc -@@ -111,13 +111,21 @@ namespace +@@ -111,13 +111,21 @@ // Wrapper handling partial write. static std::streamsize @@ -116,7 +110,7 @@ index ba830fb9e97..eedffb017b6 100644 if (__ret == -1L && errno == EINTR) continue; if (__ret == -1L) -@@ -133,7 +141,7 @@ namespace +@@ -133,7 +141,7 @@ return __n - __nleft; } @@ -125,7 +119,7 @@ index ba830fb9e97..eedffb017b6 100644 // Wrapper handling partial writev. static std::streamsize xwritev(int __fd, const char* __s1, std::streamsize __n1, -@@ -286,9 +294,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -286,9 +294,11 @@ __basic_file::is_open() const throw () { return _M_cfile != 0; } @@ -137,7 +131,7 @@ index ba830fb9e97..eedffb017b6 100644 __c_file* __basic_file::file() throw () -@@ -315,28 +325,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -315,29 +325,47 @@ { streamsize __ret; do @@ -182,11 +176,12 @@ index ba830fb9e97..eedffb017b6 100644 + __ret += xwrite(this->file(), __s2, __n2); +#else __ret += xwrite(this->fd(), __s2, __n2); -+#endif #endif ++#endif return __ret; } -@@ -350,7 +378,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + +@@ -350,8 +378,12 @@ if (__off > numeric_limits::max() || __off < numeric_limits::min()) return -1L; @@ -194,11 +189,12 @@ index ba830fb9e97..eedffb017b6 100644 + return fseek(this->file(), __off, __way); +#else return lseek(this->fd(), __off, __way); -+#endif #endif ++#endif } -@@ -361,7 +393,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + int +@@ -361,7 +393,7 @@ streamsize __basic_file::showmanyc() { @@ -207,7 +203,7 @@ index ba830fb9e97..eedffb017b6 100644 #ifdef FIONREAD // Pipes and sockets. int __num = 0; -@@ -371,7 +403,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -371,7 +403,7 @@ #endif #endif @@ -216,7 +212,7 @@ index ba830fb9e97..eedffb017b6 100644 // Cheap test. struct pollfd __pfd[1]; __pfd[0].fd = this->fd(); -@@ -395,8 +427,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -395,9 +427,13 @@ struct stat __buffer; const int __err = fstat(this->fd(), &__buffer); if (!__err && _GLIBCXX_ISREG(__buffer.st_mode)) @@ -225,15 +221,14 @@ index ba830fb9e97..eedffb017b6 100644 +#else return __buffer.st_size - lseek(this->fd(), 0, ios_base::cur); #endif -+#endif #endif ++#endif return 0; } -diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index 9f9c5a2419a..50c8f00a41c 100755 + --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -16299,7 +16299,7 @@ $as_echo_n "checking for underlying I/O to use... " >&6; } +@@ -16301,7 +16301,7 @@ if test "${enable_cstdio+set}" = set; then : enableval=$enable_cstdio; case "$enableval" in @@ -242,7 +237,7 @@ index 9f9c5a2419a..50c8f00a41c 100755 *) as_fn_error $? "Unknown argument to enable/disable cstdio" "$LINENO" 5 ;; esac -@@ -16309,16 +16309,23 @@ fi +@@ -16311,16 +16311,23 @@ @@ -270,6 +265,3 @@ index 9f9c5a2419a..50c8f00a41c 100755 ;; esac --- -2.29.2 - diff --git a/packages/gcc/10.3.0/0021-Darwin-Arm64-Initial-support-for-the-self-host-drive.patch b/packages/gcc/10.3.0/0021-Darwin-Arm64-Initial-support-for-the-self-host-drive.patch index 12d99f8..dc63fe5 100644 --- a/packages/gcc/10.3.0/0021-Darwin-Arm64-Initial-support-for-the-self-host-drive.patch +++ b/packages/gcc/10.3.0/0021-Darwin-Arm64-Initial-support-for-the-self-host-drive.patch @@ -13,18 +13,16 @@ See commit 89dc5a9d5ed3e6b2ba6a4725bd51841ee758b6cd Its been backported to gcc-10.2 --- - gcc/config.host | 7 +++++- - gcc/config/aarch64/host-aarch64-darwin.c | 32 ++++++++++++++++++++++++ - gcc/config/aarch64/x-darwin | 3 +++ + gcc/config.host | 7 +++++- + gcc/config/aarch64/host-aarch64-darwin.c | 32 +++++++++++++++++++++++++++++++ + gcc/config/aarch64/x-darwin | 3 ++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gcc/config/aarch64/host-aarch64-darwin.c create mode 100644 gcc/config/aarch64/x-darwin -diff --git a/gcc/config.host b/gcc/config.host -index 84f0433e2ad..8489145e1b1 100644 --- a/gcc/config.host +++ b/gcc/config.host -@@ -99,7 +99,8 @@ case ${host} in +@@ -99,7 +99,8 @@ esac case ${host} in @@ -34,7 +32,7 @@ index 84f0433e2ad..8489145e1b1 100644 case ${target} in aarch64*-*-*) host_extra_gcc_objs="driver-aarch64.o" -@@ -251,6 +252,10 @@ case ${host} in +@@ -251,6 +252,10 @@ host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o" host_lto_plugin_soname=liblto_plugin-0.dll ;; @@ -45,9 +43,6 @@ index 84f0433e2ad..8489145e1b1 100644 i[34567]86-*-darwin* | x86_64-*-darwin*) out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o" host_xmake_file="${host_xmake_file} i386/x-darwin" -diff --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c -new file mode 100644 -index 00000000000..1a2cd4c9dab --- /dev/null +++ b/gcc/config/aarch64/host-aarch64-darwin.c @@ -0,0 +1,32 @@ @@ -83,15 +78,9 @@ index 00000000000..1a2cd4c9dab + exists just to include the generic config/host-darwin.h. */ + +const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; -diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin -new file mode 100644 -index 00000000000..6d788d5e89c --- /dev/null +++ b/gcc/config/aarch64/x-darwin @@ -0,0 +1,3 @@ +host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c + $(COMPILE) $< + $(POSTCOMPILE) --- -2.28.0 - diff --git a/packages/gcc/10.3.0/0022-Remove-use-of-include_next-from-c-headers.patch b/packages/gcc/10.3.0/0022-Remove-use-of-include_next-from-c-headers.patch new file mode 100644 index 0000000..b32fe55 --- /dev/null +++ b/packages/gcc/10.3.0/0022-Remove-use-of-include_next-from-c-headers.patch @@ -0,0 +1,262 @@ +From 4cea8f51c23ce7112f21ff4091e7d97272b81664 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Sun, 24 Jan 2021 14:20:33 -0800 +Subject: [PATCH] Remove use of include_next from c++ headers + +Using include_next bypasses the default header search path and lets +files later in the include path take priority over earlier files. + +This makes replacing libc impossible as the default libc headers will +occur after the libstdc++ headers, and so be picked up in place of +headers inserted at the begining of the search path or appended to the +end of the search path. + +Using include_next is a hack to work-around broken combinations of +libraries, and is not necessary in a well constructed toolchain. + +Signed-off-by: Keith Packard +--- + libstdc++-v3/include/bits/std_abs.h | 4 ++-- + libstdc++-v3/include/c/cassert | 2 +- + libstdc++-v3/include/c/cctype | 2 +- + libstdc++-v3/include/c/cerrno | 2 +- + libstdc++-v3/include/c/cfloat | 2 +- + libstdc++-v3/include/c/climits | 2 +- + libstdc++-v3/include/c/clocale | 2 +- + libstdc++-v3/include/c/cmath | 2 +- + libstdc++-v3/include/c/csetjmp | 2 +- + libstdc++-v3/include/c/csignal | 2 +- + libstdc++-v3/include/c/cstdarg | 2 +- + libstdc++-v3/include/c/cstddef | 2 +- + libstdc++-v3/include/c/cstdio | 2 +- + libstdc++-v3/include/c/cstdlib | 2 +- + libstdc++-v3/include/c/cstring | 2 +- + libstdc++-v3/include/c/ctime | 2 +- + libstdc++-v3/include/c/cuchar | 2 +- + libstdc++-v3/include/c/cwchar | 2 +- + libstdc++-v3/include/c/cwctype | 2 +- + libstdc++-v3/include/c_global/cmath | 2 +- + libstdc++-v3/include/c_global/cstdlib | 2 +- + 21 files changed, 22 insertions(+), 22 deletions(-) + +--- a/libstdc++-v3/include/bits/std_abs.h ++++ b/libstdc++-v3/include/bits/std_abs.h +@@ -35,9 +35,9 @@ + #include + + #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS +-#include_next ++#include + #ifdef __CORRECT_ISO_CPP_MATH_H_PROTO +-# include_next ++# include + #endif + #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS + +--- a/libstdc++-v3/include/c/cassert ++++ b/libstdc++-v3/include/c/cassert +@@ -31,4 +31,4 @@ + #pragma GCC system_header + + #include +-#include_next ++#include +--- a/libstdc++-v3/include/c/cctype ++++ b/libstdc++-v3/include/c/cctype +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/cerrno ++++ b/libstdc++-v3/include/c/cerrno +@@ -41,7 +41,7 @@ + #pragma GCC system_header + + #include +-#include_next ++#include + + // Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998 + #ifndef errno +--- a/libstdc++-v3/include/c/cfloat ++++ b/libstdc++-v3/include/c/cfloat +@@ -32,6 +32,6 @@ + #pragma GCC system_header + + #include +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/climits ++++ b/libstdc++-v3/include/c/climits +@@ -32,6 +32,6 @@ + #pragma GCC system_header + + #include +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/clocale ++++ b/libstdc++-v3/include/c/clocale +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/cmath ++++ b/libstdc++-v3/include/c/cmath +@@ -33,7 +33,7 @@ + + #include + +-#include_next ++#include + + // Get rid of those macros defined in in lieu of real functions. + #undef abs +--- a/libstdc++-v3/include/c/csetjmp ++++ b/libstdc++-v3/include/c/csetjmp +@@ -31,7 +31,7 @@ + + #pragma GCC system_header + +-#include_next ++#include + + // Get rid of those macros defined in in lieu of real functions. + #undef longjmp +--- a/libstdc++-v3/include/c/csignal ++++ b/libstdc++-v3/include/c/csignal +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/cstdarg ++++ b/libstdc++-v3/include/c/cstdarg +@@ -32,6 +32,6 @@ + #pragma GCC system_header + + #undef __need___va_list +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/cstddef ++++ b/libstdc++-v3/include/c/cstddef +@@ -35,6 +35,6 @@ + #define __need_ptrdiff_t + #define __need_NULL + #define __need_offsetof +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/cstdio ++++ b/libstdc++-v3/include/c/cstdio +@@ -31,7 +31,7 @@ + + #pragma GCC system_header + +-#include_next ++#include + + // Get rid of those macros defined in in lieu of real functions. + #undef clearerr +--- a/libstdc++-v3/include/c/cstdlib ++++ b/libstdc++-v3/include/c/cstdlib +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/cstring ++++ b/libstdc++-v3/include/c/cstring +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/ctime ++++ b/libstdc++-v3/include/c/ctime +@@ -31,6 +31,6 @@ + + #pragma GCC system_header + +-#include_next ++#include + + #endif +--- a/libstdc++-v3/include/c/cuchar ++++ b/libstdc++-v3/include/c/cuchar +@@ -39,7 +39,7 @@ + #include + + #if _GLIBCXX_USE_C11_UCHAR_CXX11 +-# include_next ++# include + #endif + + #endif // C++11 +--- a/libstdc++-v3/include/c/cwchar ++++ b/libstdc++-v3/include/c/cwchar +@@ -36,7 +36,7 @@ + #include + + #if _GLIBCXX_HAVE_WCHAR_H +-#include_next ++#include + #endif + + // Need to do a bit of trickery here with mbstate_t as char_traits +--- a/libstdc++-v3/include/c/cwctype ++++ b/libstdc++-v3/include/c/cwctype +@@ -34,7 +34,7 @@ + #include + + #if _GLIBCXX_HAVE_WCTYPE_H +-#include_next ++#include + #endif + + #endif +--- a/libstdc++-v3/include/c_global/cmath ++++ b/libstdc++-v3/include/c_global/cmath +@@ -42,7 +42,7 @@ + #include + #include + #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS +-#include_next ++#include + #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS + #include + +--- a/libstdc++-v3/include/c_global/cstdlib ++++ b/libstdc++-v3/include/c_global/cstdlib +@@ -72,7 +72,7 @@ + // Need to ensure this finds the C library's not a libstdc++ + // wrapper that might already be installed later in the include search path. + #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS +-#include_next ++#include + #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS + #include + diff --git a/packages/gcc/10.3.0/0023-Remove-use-of-include_next-from-c-headers.patch b/packages/gcc/10.3.0/0023-Remove-use-of-include_next-from-c-headers.patch deleted file mode 100644 index 47584c2..0000000 --- a/packages/gcc/10.3.0/0023-Remove-use-of-include_next-from-c-headers.patch +++ /dev/null @@ -1,307 +0,0 @@ -From 4cea8f51c23ce7112f21ff4091e7d97272b81664 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Sun, 24 Jan 2021 14:20:33 -0800 -Subject: [PATCH] Remove use of include_next from c++ headers - -Using include_next bypasses the default header search path and lets -files later in the include path take priority over earlier files. - -This makes replacing libc impossible as the default libc headers will -occur after the libstdc++ headers, and so be picked up in place of -headers inserted at the begining of the search path or appended to the -end of the search path. - -Using include_next is a hack to work-around broken combinations of -libraries, and is not necessary in a well constructed toolchain. - -Signed-off-by: Keith Packard ---- - libstdc++-v3/include/bits/std_abs.h | 4 ++-- - libstdc++-v3/include/c/cassert | 2 +- - libstdc++-v3/include/c/cctype | 2 +- - libstdc++-v3/include/c/cerrno | 2 +- - libstdc++-v3/include/c/cfloat | 2 +- - libstdc++-v3/include/c/climits | 2 +- - libstdc++-v3/include/c/clocale | 2 +- - libstdc++-v3/include/c/cmath | 2 +- - libstdc++-v3/include/c/csetjmp | 2 +- - libstdc++-v3/include/c/csignal | 2 +- - libstdc++-v3/include/c/cstdarg | 2 +- - libstdc++-v3/include/c/cstddef | 2 +- - libstdc++-v3/include/c/cstdio | 2 +- - libstdc++-v3/include/c/cstdlib | 2 +- - libstdc++-v3/include/c/cstring | 2 +- - libstdc++-v3/include/c/ctime | 2 +- - libstdc++-v3/include/c/cuchar | 2 +- - libstdc++-v3/include/c/cwchar | 2 +- - libstdc++-v3/include/c/cwctype | 2 +- - libstdc++-v3/include/c_global/cmath | 2 +- - libstdc++-v3/include/c_global/cstdlib | 2 +- - 21 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/libstdc++-v3/include/bits/std_abs.h b/libstdc++-v3/include/bits/std_abs.h -index ae6bfc1b1ac..249ed53a3ce 100644 ---- a/libstdc++-v3/include/bits/std_abs.h -+++ b/libstdc++-v3/include/bits/std_abs.h -@@ -35,9 +35,9 @@ - #include - - #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS --#include_next -+#include - #ifdef __CORRECT_ISO_CPP_MATH_H_PROTO --# include_next -+# include - #endif - #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS - -diff --git a/libstdc++-v3/include/c/cassert b/libstdc++-v3/include/c/cassert -index abd8c0538ef..3e1b97f1626 100644 ---- a/libstdc++-v3/include/c/cassert -+++ b/libstdc++-v3/include/c/cassert -@@ -31,4 +31,4 @@ - #pragma GCC system_header - - #include --#include_next -+#include -diff --git a/libstdc++-v3/include/c/cctype b/libstdc++-v3/include/c/cctype -index d53cb3d43f3..3def33f2077 100644 ---- a/libstdc++-v3/include/c/cctype -+++ b/libstdc++-v3/include/c/cctype -@@ -31,6 +31,6 @@ - - #pragma GCC system_header - --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/cerrno b/libstdc++-v3/include/c/cerrno -index a8d3869efb6..3725137c115 100644 ---- a/libstdc++-v3/include/c/cerrno -+++ b/libstdc++-v3/include/c/cerrno -@@ -41,7 +41,7 @@ - #pragma GCC system_header - - #include --#include_next -+#include - - // Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998 - #ifndef errno -diff --git a/libstdc++-v3/include/c/cfloat b/libstdc++-v3/include/c/cfloat -index 5865d427c20..df821645e4d 100644 ---- a/libstdc++-v3/include/c/cfloat -+++ b/libstdc++-v3/include/c/cfloat -@@ -32,6 +32,6 @@ - #pragma GCC system_header - - #include --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/climits b/libstdc++-v3/include/c/climits -index 849afadeffc..b153fa8c27c 100644 ---- a/libstdc++-v3/include/c/climits -+++ b/libstdc++-v3/include/c/climits -@@ -32,6 +32,6 @@ - #pragma GCC system_header - - #include --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/clocale b/libstdc++-v3/include/c/clocale -index fc84745397d..5ebccdf5006 100644 ---- a/libstdc++-v3/include/c/clocale -+++ b/libstdc++-v3/include/c/clocale -@@ -31,6 +31,6 @@ - - #pragma GCC system_header - --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/cmath b/libstdc++-v3/include/c/cmath -index 2c51f2f13bc..2fcd09e4ef9 100644 ---- a/libstdc++-v3/include/c/cmath -+++ b/libstdc++-v3/include/c/cmath -@@ -33,7 +33,7 @@ - - #include - --#include_next -+#include - - // Get rid of those macros defined in in lieu of real functions. - #undef abs -diff --git a/libstdc++-v3/include/c/csetjmp b/libstdc++-v3/include/c/csetjmp -index db83610d95f..5abafcb160d 100644 ---- a/libstdc++-v3/include/c/csetjmp -+++ b/libstdc++-v3/include/c/csetjmp -@@ -31,7 +31,7 @@ - - #pragma GCC system_header - --#include_next -+#include - - // Get rid of those macros defined in in lieu of real functions. - #undef longjmp -diff --git a/libstdc++-v3/include/c/csignal b/libstdc++-v3/include/c/csignal -index 986c5d3daca..77cb7634a69 100644 ---- a/libstdc++-v3/include/c/csignal -+++ b/libstdc++-v3/include/c/csignal -@@ -31,6 +31,6 @@ - - #pragma GCC system_header - --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/cstdarg b/libstdc++-v3/include/c/cstdarg -index 6b6e1850753..0dfc60cc6ba 100644 ---- a/libstdc++-v3/include/c/cstdarg -+++ b/libstdc++-v3/include/c/cstdarg -@@ -32,6 +32,6 @@ - #pragma GCC system_header - - #undef __need___va_list --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/cstddef b/libstdc++-v3/include/c/cstddef -index 7fc8ce34efc..fc90dfb3f18 100644 ---- a/libstdc++-v3/include/c/cstddef -+++ b/libstdc++-v3/include/c/cstddef -@@ -35,6 +35,6 @@ - #define __need_ptrdiff_t - #define __need_NULL - #define __need_offsetof --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/cstdio b/libstdc++-v3/include/c/cstdio -index e943aa8e725..89bcd2d7391 100644 ---- a/libstdc++-v3/include/c/cstdio -+++ b/libstdc++-v3/include/c/cstdio -@@ -31,7 +31,7 @@ - - #pragma GCC system_header - --#include_next -+#include - - // Get rid of those macros defined in in lieu of real functions. - #undef clearerr -diff --git a/libstdc++-v3/include/c/cstdlib b/libstdc++-v3/include/c/cstdlib -index 86d9587482f..a26013286be 100644 ---- a/libstdc++-v3/include/c/cstdlib -+++ b/libstdc++-v3/include/c/cstdlib -@@ -31,6 +31,6 @@ - - #pragma GCC system_header - --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/cstring b/libstdc++-v3/include/c/cstring -index 8b1e89b13b6..ca56c75e753 100644 ---- a/libstdc++-v3/include/c/cstring -+++ b/libstdc++-v3/include/c/cstring -@@ -31,6 +31,6 @@ - - #pragma GCC system_header - --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/ctime b/libstdc++-v3/include/c/ctime -index 367172b21eb..135da2a25c4 100644 ---- a/libstdc++-v3/include/c/ctime -+++ b/libstdc++-v3/include/c/ctime -@@ -31,6 +31,6 @@ - - #pragma GCC system_header - --#include_next -+#include - - #endif -diff --git a/libstdc++-v3/include/c/cuchar b/libstdc++-v3/include/c/cuchar -index e63b55ae12c..c79708fba6a 100644 ---- a/libstdc++-v3/include/c/cuchar -+++ b/libstdc++-v3/include/c/cuchar -@@ -39,7 +39,7 @@ - #include - - #if _GLIBCXX_USE_C11_UCHAR_CXX11 --# include_next -+# include - #endif - - #endif // C++11 -diff --git a/libstdc++-v3/include/c/cwchar b/libstdc++-v3/include/c/cwchar -index 05d4d70c6fc..0fc9a9a394a 100644 ---- a/libstdc++-v3/include/c/cwchar -+++ b/libstdc++-v3/include/c/cwchar -@@ -36,7 +36,7 @@ - #include - - #if _GLIBCXX_HAVE_WCHAR_H --#include_next -+#include - #endif - - // Need to do a bit of trickery here with mbstate_t as char_traits -diff --git a/libstdc++-v3/include/c/cwctype b/libstdc++-v3/include/c/cwctype -index 0626765d6c8..4839b693e46 100644 ---- a/libstdc++-v3/include/c/cwctype -+++ b/libstdc++-v3/include/c/cwctype -@@ -34,7 +34,7 @@ - #include - - #if _GLIBCXX_HAVE_WCTYPE_H --#include_next -+#include - #endif - - #endif -diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath -index 39a6b036b8c..bfb6dcd4c88 100644 ---- a/libstdc++-v3/include/c_global/cmath -+++ b/libstdc++-v3/include/c_global/cmath -@@ -42,7 +42,7 @@ - #include - #include - #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS --#include_next -+#include - #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS - #include - -diff --git a/libstdc++-v3/include/c_global/cstdlib b/libstdc++-v3/include/c_global/cstdlib -index 47b954cf2fa..996a87b372c 100644 ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -72,7 +72,7 @@ namespace std - // Need to ensure this finds the C library's not a libstdc++ - // wrapper that might already be installed later in the include search path. - #define _GLIBCXX_INCLUDE_NEXT_C_HEADERS --#include_next -+#include - #undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS - #include - --- -2.30.0 - diff --git a/packages/gcc/11.2.0/0005-libstdc-Add-nostdinc-for-c-17-sources-PR100017.patch b/packages/gcc/11.2.0/0005-libstdc-Add-nostdinc-for-c-17-sources-PR100017.patch index 8851e98..4a4daf6 100644 --- a/packages/gcc/11.2.0/0005-libstdc-Add-nostdinc-for-c-17-sources-PR100017.patch +++ b/packages/gcc/11.2.0/0005-libstdc-Add-nostdinc-for-c-17-sources-PR100017.patch @@ -43,15 +43,13 @@ libstdc++-v3/ChangeLog: * src/c++17/Makefile.am (AM_CXXFLAGS): Add -nostdinc++. * src/c++17/Makefile.in: Regenerate. --- - libstdc++-v3/src/c++17/Makefile.am | 2 +- - libstdc++-v3/src/c++17/Makefile.in | 2 +- + libstdc++-v3/src/c++17/Makefile.am | 2 +- + libstdc++-v3/src/c++17/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/libstdc++-v3/src/c++17/Makefile.am b/libstdc++-v3/src/c++17/Makefile.am -index f08553a1dd78..3d53f652fac9 100644 --- a/libstdc++-v3/src/c++17/Makefile.am +++ b/libstdc++-v3/src/c++17/Makefile.am -@@ -79,7 +79,7 @@ endif +@@ -79,7 +79,7 @@ # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden # as the occasion calls for it. AM_CXXFLAGS = \ @@ -60,11 +58,9 @@ index f08553a1dd78..3d53f652fac9 100644 $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \ -diff --git a/libstdc++-v3/src/c++17/Makefile.in b/libstdc++-v3/src/c++17/Makefile.in -index 63984ecd52ad..8c02be6514f8 100644 --- a/libstdc++-v3/src/c++17/Makefile.in +++ b/libstdc++-v3/src/c++17/Makefile.in -@@ -455,7 +455,7 @@ libc__17convenience_la_SOURCES = $(sources) $(inst_sources) +@@ -455,7 +455,7 @@ # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden # as the occasion calls for it. AM_CXXFLAGS = \ @@ -73,6 +69,3 @@ index 63984ecd52ad..8c02be6514f8 100644 $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \ --- -2.34.1 - diff --git a/packages/gcc/11.2.0/0009-Darwin-aarch64-Initial-support-for-the-self-host-dri.patch b/packages/gcc/11.2.0/0009-Darwin-aarch64-Initial-support-for-the-self-host-dri.patch index b237d9d..ab73edb 100644 --- a/packages/gcc/11.2.0/0009-Darwin-aarch64-Initial-support-for-the-self-host-dri.patch +++ b/packages/gcc/11.2.0/0009-Darwin-aarch64-Initial-support-for-the-self-host-dri.patch @@ -14,18 +14,16 @@ gcc/ChangeLog: * config/aarch64/host-aarch64-darwin.c: New file. * config/aarch64/x-darwin: New file. --- - gcc/config.host | 7 ++++- - gcc/config/aarch64/host-aarch64-darwin.c | 33 ++++++++++++++++++++++++ - gcc/config/aarch64/x-darwin | 3 +++ + gcc/config.host | 7 +++++- + gcc/config/aarch64/host-aarch64-darwin.c | 33 +++++++++++++++++++++++++++++++ + gcc/config/aarch64/x-darwin | 3 ++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gcc/config/aarch64/host-aarch64-darwin.c create mode 100644 gcc/config/aarch64/x-darwin -diff --git a/gcc/config.host b/gcc/config.host -index 0a02c33cc80..81ff7ed1043 100644 --- a/gcc/config.host +++ b/gcc/config.host -@@ -99,7 +99,8 @@ case ${host} in +@@ -99,7 +99,8 @@ esac case ${host} in @@ -35,7 +33,7 @@ index 0a02c33cc80..81ff7ed1043 100644 case ${target} in aarch64*-*-*) host_extra_gcc_objs="driver-aarch64.o" -@@ -251,6 +252,10 @@ case ${host} in +@@ -251,6 +252,10 @@ host_extra_gcc_objs="${host_extra_gcc_objs} driver-mingw32.o" host_lto_plugin_soname=liblto_plugin.dll ;; @@ -46,9 +44,6 @@ index 0a02c33cc80..81ff7ed1043 100644 i[34567]86-*-darwin* | x86_64-*-darwin*) out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o" host_xmake_file="${host_xmake_file} i386/x-darwin" -diff --git a/gcc/config/aarch64/host-aarch64-darwin.c b/gcc/config/aarch64/host-aarch64-darwin.c -new file mode 100644 -index 00000000000..d70f2df3bf1 --- /dev/null +++ b/gcc/config/aarch64/host-aarch64-darwin.c @@ -0,0 +1,33 @@ @@ -85,15 +80,9 @@ index 00000000000..d70f2df3bf1 + exists just to include the generic config/host-darwin.h. */ + +const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; -diff --git a/gcc/config/aarch64/x-darwin b/gcc/config/aarch64/x-darwin -new file mode 100644 -index 00000000000..6d788d5e89c --- /dev/null +++ b/gcc/config/aarch64/x-darwin @@ -0,0 +1,3 @@ +host-aarch64-darwin.o : $(srcdir)/config/aarch64/host-aarch64-darwin.c + $(COMPILE) $< + $(POSTCOMPILE) --- -2.34.1 - diff --git a/packages/gcc/4.9.4/0033-fix-c6x-internal-compiler-error-and-multilib.patch b/packages/gcc/4.9.4/0033-fix-c6x-internal-compiler-error-and-multilib.patch index 398f904..26df26b 100644 --- a/packages/gcc/4.9.4/0033-fix-c6x-internal-compiler-error-and-multilib.patch +++ b/packages/gcc/4.9.4/0033-fix-c6x-internal-compiler-error-and-multilib.patch @@ -5,6 +5,12 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57295 Fix c6x mulitibs build for uclinux Reported by: Dan Tejada +--- + gcc/config/c6x/c6x.md | 2 +- + gcc/config/c6x/predicates.md | 13 +++++++++++++ + gcc/config/c6x/t-c6x-uclinux | 4 +++- + 3 files changed, 17 insertions(+), 2 deletions(-) + --- a/gcc/config/c6x/c6x.md +++ b/gcc/config/c6x/c6x.md @@ -775,7 +775,7 @@ @@ -16,7 +22,6 @@ Reported by: Dan Tejada { emit_insn (gen_movmisalign_store (operands[0], operands[1])); DONE; - --- a/gcc/config/c6x/predicates.md +++ b/gcc/config/c6x/predicates.md @@ -224,3 +224,16 @@ @@ -36,7 +41,6 @@ Reported by: Dan Tejada + (if_then_else (match_test "reload_in_progress") + (match_test "strict_memory_address_p (mode, XEXP (op, 0))") + (match_test "memory_address_p (mode, XEXP (op, 0))"))))) - --- a/gcc/config/c6x/t-c6x-uclinux +++ b/gcc/config/c6x/t-c6x-uclinux @@ -1,3 +1,5 @@ diff --git a/packages/gcc/4.9.4/0034-c++17-build-failure.patch b/packages/gcc/4.9.4/0034-c++17-build-failure.patch index cc56aca..f545c85 100644 --- a/packages/gcc/4.9.4/0034-c++17-build-failure.patch +++ b/packages/gcc/4.9.4/0034-c++17-build-failure.patch @@ -4,8 +4,12 @@ Fixes Fixed upstream in GCC6+ in d57c99458933. ---- gcc-4.9.4/gcc/reload.h 2022-01-01 15:51:43.293254281 -0800 -+++ gcc-4.9.4/gcc/reload.h 2022-01-01 15:51:58.437424873 -0800 +--- + gcc/reload.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/gcc/reload.h ++++ b/gcc/reload.h @@ -166,7 +166,7 @@ value indicates the level of indirect addressing supported, e.g., two means that (MEM (MEM (REG n))) is also valid if (REG n) does not get diff --git a/packages/gcc/8.5.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/8.5.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch index 20a88df..11cb9e0 100644 --- a/packages/gcc/8.5.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch +++ b/packages/gcc/8.5.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch @@ -53,7 +53,7 @@ if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then --- a/gcc/configure +++ b/gcc/configure -@@ -29805,6 +29805,9 @@ +@@ -29872,6 +29872,9 @@ pluginlibs= plugin_check=yes @@ -63,7 +63,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -29827,6 +29830,11 @@ +@@ -29894,6 +29897,11 @@ export_sym_check= fi ;; @@ -75,7 +75,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -29939,23 +29947,23 @@ +@@ -30006,23 +30014,23 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` diff --git a/packages/gcc/8.5.0/0005-fix-m68k-uclinux.patch b/packages/gcc/8.5.0/0005-fix-m68k-uclinux.patch index 02b53bd..4dd3260 100644 --- a/packages/gcc/8.5.0/0005-fix-m68k-uclinux.patch +++ b/packages/gcc/8.5.0/0005-fix-m68k-uclinux.patch @@ -10,7 +10,7 @@ Signed-off-by: Waldemar Brodkorb --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -847,7 +847,7 @@ +@@ -857,7 +857,7 @@ m68k*-*-openbsd*) ;; m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc diff --git a/packages/gcc/8.5.0/0010-crystax.patch b/packages/gcc/8.5.0/0010-crystax.patch index 0e3e95c..ab6c01e 100644 --- a/packages/gcc/8.5.0/0010-crystax.patch +++ b/packages/gcc/8.5.0/0010-crystax.patch @@ -57,7 +57,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 esac aarch64_multilibs="${with_multilib_list}" if test "$aarch64_multilibs" = "default"; then -@@ -2133,6 +2137,17 @@ +@@ -2142,6 +2146,17 @@ tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h" extra_options="${extra_options} linux-android.opt" case ${target} in @@ -172,7 +172,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 : min >= -256 && max < 256 \ --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md -@@ -8640,7 +8640,7 @@ +@@ -8698,7 +8698,7 @@ (match_operand:SI 2 "const_int_operand" "") ; total range (match_operand:SI 3 "" "") ; table label (match_operand:SI 4 "" "")] ; Out of range label @@ -450,7 +450,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \ --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -78491,6 +78491,18 @@ +@@ -78672,6 +78672,18 @@ /* end confdefs.h. */ #include int lk; diff --git a/packages/gcc/8.5.0/0012-crystax.patch b/packages/gcc/8.5.0/0012-crystax.patch index 2bf6cc7..332e59f 100644 --- a/packages/gcc/8.5.0/0012-crystax.patch +++ b/packages/gcc/8.5.0/0012-crystax.patch @@ -26,7 +26,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 --- a/gcc/config.in +++ b/gcc/config.in -@@ -2219,6 +2219,12 @@ +@@ -2233,6 +2233,12 @@ #endif @@ -127,7 +127,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 --- a/gcc/configure +++ b/gcc/configure -@@ -943,6 +943,7 @@ +@@ -944,6 +944,7 @@ enable_fix_cortex_a53_843419 with_glibc_version enable_gnu_unique_object @@ -135,7 +135,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 enable_linker_build_id enable_libssp enable_default_ssp -@@ -1684,6 +1685,9 @@ +@@ -1685,6 +1686,9 @@ --enable-gnu-unique-object enable the use of the @gnu_unique_object ELF extension on glibc systems @@ -145,7 +145,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 --enable-linker-build-id compiler will always pass --build-id to linker --enable-libssp enable linking against libssp -@@ -28319,6 +28323,38 @@ +@@ -28383,6 +28387,38 @@ $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h @@ -186,7 +186,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; } --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -5140,6 +5140,35 @@ +@@ -5147,6 +5147,35 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1, [Define if your linker supports .eh_frame_hdr.]) diff --git a/packages/gcc/8.5.0/0013-crystax.patch b/packages/gcc/8.5.0/0013-crystax.patch index 3454df0..c695798 100644 --- a/packages/gcc/8.5.0/0013-crystax.patch +++ b/packages/gcc/8.5.0/0013-crystax.patch @@ -12,7 +12,7 @@ Date: Thu Aug 20 19:11:07 2015 +0300 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c -@@ -15971,6 +15971,7 @@ +@@ -15895,6 +15895,7 @@ else if (!SYMBOL_REF_FAR_ADDR_P (op0) && (SYMBOL_REF_LOCAL_P (op0) || (HAVE_LD_PIE_COPYRELOC diff --git a/packages/gcc/8.5.0/0015-crystax.patch b/packages/gcc/8.5.0/0015-crystax.patch index 2424d2b..d62a57b 100644 --- a/packages/gcc/8.5.0/0015-crystax.patch +++ b/packages/gcc/8.5.0/0015-crystax.patch @@ -15,7 +15,7 @@ Date: Mon Apr 14 21:05:51 2014 -0700 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c -@@ -22619,9 +22619,13 @@ +@@ -22671,9 +22671,13 @@ memsize = MEM_SIZE (x); /* Only certain alignment specifiers are supported by the hardware. */ diff --git a/packages/gcc/8.5.0/0022-ARC-Update-fma-expansions.patch b/packages/gcc/8.5.0/0022-ARC-Update-fma-expansions.patch index c2680d5..380618f 100644 --- a/packages/gcc/8.5.0/0022-ARC-Update-fma-expansions.patch +++ b/packages/gcc/8.5.0/0022-ARC-Update-fma-expansions.patch @@ -18,13 +18,11 @@ gcc/testsuite git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261543 138bc75d-0d04-0410-961f-82ee72b054a4 --- - gcc/config/arc/fpu.md | 6 ++++++ - gcc/testsuite/gcc.target/arc/fma-1.c | 13 +++++++++++++ + gcc/config/arc/fpu.md | 6 ++++++ + gcc/testsuite/gcc.target/arc/fma-1.c | 13 +++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 gcc/testsuite/gcc.target/arc/fma-1.c -diff --git a/gcc/config/arc/fpu.md b/gcc/config/arc/fpu.md -index 5c56f76c679..66a4d91616f 100644 --- a/gcc/config/arc/fpu.md +++ b/gcc/config/arc/fpu.md @@ -64,6 +64,9 @@ @@ -47,9 +45,6 @@ index 5c56f76c679..66a4d91616f 100644 }") (define_insn "fmasf4_fpu" -diff --git a/gcc/testsuite/gcc.target/arc/fma-1.c b/gcc/testsuite/gcc.target/arc/fma-1.c -new file mode 100644 -index 00000000000..c195ad98127 --- /dev/null +++ b/gcc/testsuite/gcc.target/arc/fma-1.c @@ -0,0 +1,13 @@ @@ -66,6 +61,3 @@ index 00000000000..c195ad98127 + return (float)3.0 * b + a; +} +/* { dg-final { scan-assembler "fsmadd" } } */ --- -2.16.2 - diff --git a/packages/gcc/9.4.0/0000-libtool-leave-framework-alone.patch b/packages/gcc/9.4.0/0000-libtool-leave-framework-alone.patch index b5804ea..1a86e41 100644 --- a/packages/gcc/9.4.0/0000-libtool-leave-framework-alone.patch +++ b/packages/gcc/9.4.0/0000-libtool-leave-framework-alone.patch @@ -4,7 +4,7 @@ --- a/libtool-ldflags +++ b/libtool-ldflags -@@ -36,6 +36,11 @@ prev_arg= +@@ -36,6 +36,11 @@ for arg do case $arg in diff --git a/packages/gcc/9.4.0/0001-uclibc-conf.patch b/packages/gcc/9.4.0/0001-uclibc-conf.patch index a9ae872..aef750a 100644 --- a/packages/gcc/9.4.0/0001-uclibc-conf.patch +++ b/packages/gcc/9.4.0/0001-uclibc-conf.patch @@ -4,7 +4,7 @@ --- a/contrib/regression/objs-gcc.sh +++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H +@@ -106,6 +106,10 @@ then make all-gdb all-dejagnu all-ld || exit 1 make install-gdb install-dejagnu install-ld || exit 1 diff --git a/packages/gcc/9.4.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/packages/gcc/9.4.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch index 18fe931..0f2c7c1 100644 --- a/packages/gcc/9.4.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch +++ b/packages/gcc/9.4.0/0002-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch @@ -6,7 +6,7 @@ --- a/config/gcc-plugin.m4 +++ b/config/gcc-plugin.m4 -@@ -21,6 +21,9 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], +@@ -21,6 +21,9 @@ pluginlibs= plugin_check=yes @@ -16,7 +16,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -43,6 +46,11 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], +@@ -43,6 +46,11 @@ export_sym_check= fi ;; @@ -28,7 +28,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -94,17 +102,17 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], +@@ -94,17 +102,17 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` @@ -53,7 +53,7 @@ if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then --- a/gcc/configure +++ b/gcc/configure -@@ -29862,6 +29862,9 @@ fi +@@ -29898,6 +29898,9 @@ pluginlibs= plugin_check=yes @@ -63,7 +63,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -29884,6 +29887,11 @@ fi +@@ -29920,6 +29923,11 @@ export_sym_check= fi ;; @@ -75,7 +75,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -29996,23 +30004,23 @@ fi +@@ -30032,23 +30040,23 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` @@ -108,7 +108,7 @@ } --- a/libcc1/configure +++ b/libcc1/configure -@@ -14785,6 +14785,9 @@ fi +@@ -14802,6 +14802,9 @@ pluginlibs= plugin_check=yes @@ -118,7 +118,7 @@ case "${host}" in *-*-mingw*) # Since plugin support under MinGW is not as straightforward as on -@@ -14807,6 +14810,11 @@ fi +@@ -14824,6 +14827,11 @@ export_sym_check= fi ;; @@ -130,7 +130,7 @@ *) if test x$build = x$host; then export_sym_check="objdump${exeext} -T" -@@ -14919,23 +14927,23 @@ fi +@@ -14936,23 +14944,23 @@ case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` diff --git a/packages/gcc/9.4.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch b/packages/gcc/9.4.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch index 3040e23..5f9a07a 100644 --- a/packages/gcc/9.4.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch +++ b/packages/gcc/9.4.0/0003-gcc-plugin-POSIX-include-sys-select-h.patch @@ -4,7 +4,7 @@ --- a/libcc1/connection.cc +++ b/libcc1/connection.cc -@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. +@@ -21,6 +21,7 @@ #include #include #include diff --git a/packages/gcc/9.4.0/0005-fix-m68k-uclinux.patch b/packages/gcc/9.4.0/0005-fix-m68k-uclinux.patch index 62bea0e..67d22db 100644 --- a/packages/gcc/9.4.0/0005-fix-m68k-uclinux.patch +++ b/packages/gcc/9.4.0/0005-fix-m68k-uclinux.patch @@ -10,7 +10,7 @@ Signed-off-by: Waldemar Brodkorb --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -875,7 +875,7 @@ m68k*-*-netbsdelf*) +@@ -885,7 +885,7 @@ m68k*-*-openbsd*) ;; m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc diff --git a/packages/gcc/9.4.0/0006-libgfortran-missing-include.patch b/packages/gcc/9.4.0/0006-libgfortran-missing-include.patch index f93524b..d4917ee 100644 --- a/packages/gcc/9.4.0/0006-libgfortran-missing-include.patch +++ b/packages/gcc/9.4.0/0006-libgfortran-missing-include.patch @@ -4,11 +4,11 @@ --- a/libgfortran/io/close.c +++ b/libgfortran/io/close.c -@@ -29,6 +29,7 @@ see the files COPYING3 and COPYING.RUNTI +@@ -29,6 +29,7 @@ #if !HAVE_UNLINK_OPEN_FILE #include #endif +#include typedef enum - { CLOSE_DELETE, CLOSE_KEEP, CLOSE_UNSPECIFIED } + { CLOSE_INVALID = - 1, CLOSE_DELETE, CLOSE_KEEP, CLOSE_UNSPECIFIED } diff --git a/packages/gcc/9.4.0/0009-bionic-ndk.patch b/packages/gcc/9.4.0/0009-bionic-ndk.patch index 090172d..474dd8c 100644 --- a/packages/gcc/9.4.0/0009-bionic-ndk.patch +++ b/packages/gcc/9.4.0/0009-bionic-ndk.patch @@ -29,7 +29,7 @@ Date: Tue Apr 25 19:02:18 2017 -0700 namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -@@ -41,17 +53,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -41,17 +53,17 @@ // NB: Offsets into ctype::_M_table force a particular size // on the mask type. Because of this, we don't use an enum. typedef char mask; diff --git a/packages/gcc/9.4.0/0010-crystax.patch b/packages/gcc/9.4.0/0010-crystax.patch index 8ac327a..2b67aed 100644 --- a/packages/gcc/9.4.0/0010-crystax.patch +++ b/packages/gcc/9.4.0/0010-crystax.patch @@ -37,7 +37,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -1022,14 +1022,18 @@ aarch64*-*-freebsd*) +@@ -1023,14 +1023,18 @@ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1" ;; aarch64*-*-linux*) @@ -57,7 +57,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 esac aarch64_multilibs="${with_multilib_list}" if test "$aarch64_multilibs" = "default"; then -@@ -2272,6 +2276,17 @@ mips*-*-linux*) # Linux MIPS, either +@@ -2273,6 +2277,17 @@ tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h" extra_options="${extra_options} linux-android.opt" case ${target} in @@ -157,7 +157,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h -@@ -1856,12 +1856,13 @@ enum arm_auto_incmodes +@@ -1856,12 +1856,13 @@ #define CASE_VECTOR_PC_RELATIVE ((TARGET_THUMB2 \ || (TARGET_THUMB1 \ @@ -174,7 +174,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 : min >= -256 && max < 256 \ --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md -@@ -8920,7 +8920,7 @@ +@@ -8987,7 +8987,7 @@ (match_operand:SI 2 "const_int_operand" "") ; total range (match_operand:SI 3 "" "") ; table label (match_operand:SI 4 "" "")] ; Out of range label @@ -185,7 +185,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 enum insn_code code; --- a/gcc/config/arm/arm.opt +++ b/gcc/config/arm/arm.opt -@@ -202,6 +202,10 @@ mthumb-interwork +@@ -202,6 +202,10 @@ Target Report Mask(INTERWORK) Support calls between Thumb and ARM instruction sets. @@ -250,7 +250,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC, \ --- a/gcc/config/i386/gnu-user.h +++ b/gcc/config/i386/gnu-user.h -@@ -65,9 +65,14 @@ along with GCC; see the file COPYING3. +@@ -65,9 +65,14 @@ When the -shared link option is used a final link is not being done. */ @@ -268,7 +268,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #define SUBTARGET_EXTRA_SPECS \ --- a/gcc/config/i386/gnu-user64.h +++ b/gcc/config/i386/gnu-user64.h -@@ -46,6 +46,11 @@ see the files COPYING3 and COPYING.RUNTI +@@ -46,6 +46,11 @@ #define SPEC_X32 "mx32" #endif @@ -282,7 +282,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 %{" SPEC_64 ":--64} \ --- a/gcc/config/i386/linux-common.h +++ b/gcc/config/i386/linux-common.h -@@ -36,7 +36,13 @@ along with GCC; see the file COPYING3. +@@ -36,7 +36,13 @@ #undef CC1_SPEC #define CC1_SPEC \ LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \ @@ -377,7 +377,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 + LINUX_DRIVER_SELF_SPECS --- a/gcc/config/mips/gnu-user.h +++ b/gcc/config/mips/gnu-user.h -@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. +@@ -36,6 +36,7 @@ /* The GNU C++ standard library requires this. */ \ if (c_dialect_cxx ()) \ builtin_define ("_GNU_SOURCE"); \ @@ -385,7 +385,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 } while (0) #undef SUBTARGET_CPP_SPEC -@@ -71,7 +72,8 @@ along with GCC; see the file COPYING3. +@@ -71,7 +72,8 @@ #undef SUBTARGET_ASM_SPEC #define SUBTARGET_ASM_SPEC \ @@ -395,7 +395,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 /* The MIPS assembler has different syntax for .set. We set it to .dummy to trap any errors. */ -@@ -120,7 +122,7 @@ extern const char *host_detect_local_cpu +@@ -120,7 +122,7 @@ #endif #define LINUX_DRIVER_SELF_SPECS \ @@ -406,7 +406,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 specs handling by removing a redundant option. */ \ --- a/gcc/config/mips/linux-common.h +++ b/gcc/config/mips/linux-common.h -@@ -38,7 +38,7 @@ along with GCC; see the file COPYING3. +@@ -38,7 +38,7 @@ #undef SUBTARGET_CC1_SPEC #define SUBTARGET_CC1_SPEC \ LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \ @@ -430,7 +430,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 +MULTILIB_REQUIRED = mabi=32/mips32 mabi=32/mips32r2 mabi=32/mips32r6 mips64r2 mips64r6 --- a/libgcc/gthr-posix.h +++ b/libgcc/gthr-posix.h -@@ -32,6 +32,19 @@ see the files COPYING3 and COPYING.RUNTI +@@ -32,6 +32,19 @@ #define __GTHREADS 1 #define __GTHREADS_CXX0X 1 @@ -452,7 +452,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \ --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -78982,6 +78982,18 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ +@@ -78984,6 +78984,18 @@ /* end confdefs.h. */ #include int lk; @@ -494,7 +494,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -@@ -1104,7 +1118,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1104,7 +1118,7 @@ * @return @a __hi. */ virtual const char* @@ -503,7 +503,7 @@ Date: Wed Jul 29 11:28:29 2015 +0300 { if (__builtin_expect(__hi != __lo, true)) __builtin_memcpy(__to, __lo, __hi - __lo); -@@ -1167,7 +1181,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -1167,7 +1181,7 @@ private: void _M_narrow_init() const; diff --git a/packages/gcc/9.4.0/0012-crystax.patch b/packages/gcc/9.4.0/0012-crystax.patch index 1363d29..ec0faf6 100644 --- a/packages/gcc/9.4.0/0012-crystax.patch +++ b/packages/gcc/9.4.0/0012-crystax.patch @@ -16,17 +16,16 @@ Date: Mon Apr 14 15:59:47 2014 -0700 gcc/config/freebsd.h | 4 +++ gcc/config/gnu-user.h | 4 +++ gcc/config/openbsd.h | 4 +++ - gcc/config/rs6000/sysv4.h | 6 ++++- gcc/config/sol2.h | 4 +++ gcc/configure | 36 +++++++++++++++++++++++++++++++++ gcc/configure.ac | 29 ++++++++++++++++++++++++++ gcc/testsuite/g++.dg/eh/spec3-static.C | 25 ++++++++++++++++++++++ libgcc/crtstuff.c | 11 ++++++---- - 11 files changed, 128 insertions(+), 5 deletions(-) + 10 files changed, 123 insertions(+), 4 deletions(-) --- a/gcc/config.in +++ b/gcc/config.in -@@ -2197,6 +2197,12 @@ +@@ -2204,6 +2204,12 @@ #endif @@ -41,7 +40,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 #ifndef USED_FOR_TARGET --- a/gcc/config/alpha/elf.h +++ b/gcc/config/alpha/elf.h -@@ -142,5 +142,9 @@ extern int alpha_this_gpdisp_sequence_nu +@@ -142,5 +142,9 @@ I imagine that other systems will catch up. In the meantime, it doesn't harm to make sure that the data exists to be used later. */ #if defined(HAVE_LD_EH_FRAME_HDR) @@ -53,7 +52,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 +#endif --- a/gcc/config/freebsd.h +++ b/gcc/config/freebsd.h -@@ -45,8 +45,12 @@ along with GCC; see the file COPYING3. +@@ -45,8 +45,12 @@ #define LIB_SPEC FBSD_LIB_SPEC #if defined(HAVE_LD_EH_FRAME_HDR) @@ -68,7 +67,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ --- a/gcc/config/gnu-user.h +++ b/gcc/config/gnu-user.h -@@ -106,8 +106,12 @@ see the files COPYING3 and COPYING.RUNTI +@@ -106,8 +106,12 @@ #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC #if defined(HAVE_LD_EH_FRAME_HDR) @@ -83,7 +82,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 "%{static|static-pie:--start-group} %G %{!nolibc:%L} \ --- a/gcc/config/openbsd.h +++ b/gcc/config/openbsd.h -@@ -136,8 +136,12 @@ while (0) +@@ -136,8 +136,12 @@ #define LIB_SPEC OBSD_LIB_SPEC #if defined(HAVE_LD_EH_FRAME_HDR) @@ -98,7 +97,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 #define LIB_SPEC OBSD_LIB_SPEC --- a/gcc/config/sol2.h +++ b/gcc/config/sol2.h -@@ -434,7 +434,11 @@ along with GCC; see the file COPYING3. +@@ -434,7 +434,11 @@ /* Solaris 11 build 135+ implements dl_iterate_phdr. GNU ld needs --eh-frame-hdr to create the required .eh_frame_hdr sections. */ #if defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) @@ -112,7 +111,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 --- a/gcc/configure +++ b/gcc/configure -@@ -986,6 +986,7 @@ enable_fix_cortex_a53_835769 +@@ -986,6 +986,7 @@ enable_fix_cortex_a53_843419 with_glibc_version enable_gnu_unique_object @@ -120,7 +119,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 enable_linker_build_id enable_libssp enable_default_ssp -@@ -1737,6 +1738,9 @@ Optional Features: +@@ -1737,6 +1738,9 @@ --enable-gnu-unique-object enable the use of the @gnu_unique_object ELF extension on glibc systems @@ -130,7 +129,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 --enable-linker-build-id compiler will always pass --build-id to linker --enable-libssp enable linking against libssp -@@ -28349,6 +28353,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xye +@@ -28382,6 +28386,38 @@ $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h @@ -171,7 +170,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 $as_echo "$gcc_cv_ld_eh_frame_hdr" >&6; } --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -5171,6 +5171,35 @@ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HD +@@ -5176,6 +5176,35 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1, [Define if your linker supports .eh_frame_hdr.]) @@ -237,7 +236,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 +} --- a/libgcc/crtstuff.c +++ b/libgcc/crtstuff.c -@@ -88,7 +88,8 @@ call_ ## FUNC (void) \ +@@ -88,7 +88,8 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) \ @@ -247,7 +246,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 && defined(BSD_DL_ITERATE_PHDR_AVAILABLE) #include # define USE_PT_GNU_EH_FRAME -@@ -97,7 +98,8 @@ call_ ## FUNC (void) \ +@@ -97,7 +98,8 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) \ @@ -257,7 +256,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 && defined(__sun__) && defined(__svr4__) #include # define USE_PT_GNU_EH_FRAME -@@ -106,7 +108,8 @@ call_ ## FUNC (void) \ +@@ -106,7 +108,8 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) \ @@ -267,7 +266,7 @@ Date: Mon Apr 14 15:59:47 2014 -0700 && defined(__GLIBC__) && __GLIBC__ >= 2 #include /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h. -@@ -121,7 +124,7 @@ call_ ## FUNC (void) \ +@@ -121,7 +124,7 @@ #if defined(OBJECT_FORMAT_ELF) \ && !defined(OBJECT_FORMAT_FLAT) \ && defined(HAVE_LD_EH_FRAME_HDR) \ diff --git a/packages/gcc/9.4.0/0013-crystax.patch b/packages/gcc/9.4.0/0013-crystax.patch index e7fdd6e..a4bac50 100644 --- a/packages/gcc/9.4.0/0013-crystax.patch +++ b/packages/gcc/9.4.0/0013-crystax.patch @@ -12,7 +12,7 @@ Date: Thu Aug 20 19:11:07 2015 +0300 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c -@@ -15635,6 +15635,7 @@ legitimate_pic_address_disp_p (rtx disp) +@@ -15674,6 +15674,7 @@ else if (!SYMBOL_REF_FAR_ADDR_P (op0) && (SYMBOL_REF_LOCAL_P (op0) || (HAVE_LD_PIE_COPYRELOC diff --git a/packages/gcc/9.4.0/0014-crystax.patch b/packages/gcc/9.4.0/0014-crystax.patch index 5acc6b9..8f2eb43 100644 --- a/packages/gcc/9.4.0/0014-crystax.patch +++ b/packages/gcc/9.4.0/0014-crystax.patch @@ -12,7 +12,7 @@ Date: Fri Aug 21 17:41:59 2015 +0300 --- a/libgcc/gthr.h +++ b/libgcc/gthr.h -@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTI +@@ -145,7 +145,11 @@ #define GTHREAD_USE_WEAK 1 #endif #endif diff --git a/packages/gcc/9.4.0/0015-crystax.patch b/packages/gcc/9.4.0/0015-crystax.patch index a0bad24..63d0efb 100644 --- a/packages/gcc/9.4.0/0015-crystax.patch +++ b/packages/gcc/9.4.0/0015-crystax.patch @@ -15,7 +15,7 @@ Date: Mon Apr 14 21:05:51 2014 -0700 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c -@@ -22862,9 +22862,13 @@ arm_print_operand (FILE *stream, rtx x, +@@ -22868,9 +22868,13 @@ memsize = MEM_SIZE (x); /* Only certain alignment specifiers are supported by the hardware. */ diff --git a/packages/gcc/9.4.0/0017-crystax.patch b/packages/gcc/9.4.0/0017-crystax.patch index 1a46aed..28284ff 100644 --- a/packages/gcc/9.4.0/0017-crystax.patch +++ b/packages/gcc/9.4.0/0017-crystax.patch @@ -24,7 +24,7 @@ Date: Tue Aug 25 09:36:42 2015 +0300 #endif /* GCC_AARCH64_LINUX_ANDROID_H */ --- a/gcc/config/mips/linux-common.h +++ b/gcc/config/mips/linux-common.h -@@ -65,3 +65,7 @@ along with GCC; see the file COPYING3. +@@ -65,3 +65,7 @@ /* The default value isn't sufficient in 64-bit mode. */ #define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024) diff --git a/packages/gcc/9.4.0/0018-isl-0.20.patch b/packages/gcc/9.4.0/0018-isl-0.20.patch index de188b1..3e14966 100644 --- a/packages/gcc/9.4.0/0018-isl-0.20.patch +++ b/packages/gcc/9.4.0/0018-isl-0.20.patch @@ -15,7 +15,7 @@ Date: Mon Sep 24 22:50:11 2018 -0700 --- a/gcc/graphite.h +++ b/gcc/graphite.h -@@ -26,6 +26,8 @@ along with GCC; see the file COPYING3. +@@ -26,6 +26,8 @@ #include #include #include diff --git a/packages/gdb/11.2/0002-allow-android.patch b/packages/gdb/11.2/0002-allow-android.patch index d6c5869..3365d87 100644 --- a/packages/gdb/11.2/0002-allow-android.patch +++ b/packages/gdb/11.2/0002-allow-android.patch @@ -5,7 +5,7 @@ --- a/gdbserver/configure +++ b/gdbserver/configure -@@ -10028,17 +10028,6 @@ +@@ -10052,17 +10052,6 @@ case "${target}" in diff --git a/packages/gdb/7.12.1/0006-duplicate-typedef.patch b/packages/gdb/7.12.1/0006-duplicate-typedef.patch index cbbc3e2..4d51a48 100644 --- a/packages/gdb/7.12.1/0006-duplicate-typedef.patch +++ b/packages/gdb/7.12.1/0006-duplicate-typedef.patch @@ -1,6 +1,9 @@ -diff -urpN gdb-7.12.1.orig/gdb/event-loop.h gdb-7.12.1/gdb/event-loop.h ---- gdb-7.12.1.orig/gdb/event-loop.h 2017-01-21 05:46:46.000000000 -0800 -+++ gdb-7.12.1/gdb/event-loop.h 2019-03-14 11:55:56.280325742 -0700 +--- + gdb/event-loop.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/gdb/event-loop.h ++++ b/gdb/event-loop.h @@ -66,6 +66,8 @@ infinite loop. @@ -10,7 +13,7 @@ diff -urpN gdb-7.12.1.orig/gdb/event-loop.h gdb-7.12.1/gdb/event-loop.h typedef void *gdb_client_data; struct async_signal_handler; -@@ -127,3 +129,5 @@ extern void mark_async_event_handler (st +@@ -127,3 +129,5 @@ extern void clear_async_event_handler (struct async_event_handler *handler); extern void initialize_async_signal_handlers (void); diff --git a/packages/gdb/8.2.1/0005-musl-aarch64-sigcontext.patch b/packages/gdb/8.2.1/0005-musl-aarch64-sigcontext.patch index 9456dbb..a45a8c1 100644 --- a/packages/gdb/8.2.1/0005-musl-aarch64-sigcontext.patch +++ b/packages/gdb/8.2.1/0005-musl-aarch64-sigcontext.patch @@ -1,15 +1,13 @@ --- - gdb/nat/aarch64-sve-linux-ptrace.h | 2 +- + gdb/nat/aarch64-sve-linux-ptrace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdb/nat/aarch64-sve-linux-ptrace.h b/gdb/nat/aarch64-sve-linux-ptrace.h -index 029e753ffe..172ae39432 100644 --- a/gdb/nat/aarch64-sve-linux-ptrace.h +++ b/gdb/nat/aarch64-sve-linux-ptrace.h @@ -20,7 +20,7 @@ #ifndef AARCH64_SVE_LINUX_PTRACE_H #define AARCH64_SVE_LINUX_PTRACE_H - + -#include +#include #include diff --git a/packages/glibc/2.17/0018-fix-GCC-10-detection.patch b/packages/glibc/2.17/0018-fix-GCC-10-detection.patch index b522ae7..6ee9444 100644 --- a/packages/glibc/2.17/0018-fix-GCC-10-detection.patch +++ b/packages/glibc/2.17/0018-fix-GCC-10-detection.patch @@ -4,14 +4,12 @@ Date: Fri, 5 Jun 2020 09:11:40 +0200 Subject: [PATCH] Fix GCC 10+ detection --- - configure | 2 +- + configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure b/configure -index 8799b7de78..0f99f04bfc 100755 --- a/configure +++ b/configure -@@ -4909,7 +4909,7 @@ $as_echo_n "checking version of $CC... " >&6; } +@@ -4909,7 +4909,7 @@ ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -20,6 +18,3 @@ index 8799b7de78..0f99f04bfc 100755 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; --- -2.25.1 - diff --git a/packages/glibc/2.17/0019-glibc-rh731833-misc-5.patch b/packages/glibc/2.17/0019-glibc-rh731833-misc-5.patch index ad46fe5..8074621 100644 --- a/packages/glibc/2.17/0019-glibc-rh731833-misc-5.patch +++ b/packages/glibc/2.17/0019-glibc-rh731833-misc-5.patch @@ -7,14 +7,12 @@ This patch reserves four pointer to be used in future Event-Based Branch framework for PowerPC. (cherry picked from commit e55a9b256d53c7fc5145e3e4d338d3741b23e232) --- - nptl/sysdeps/powerpc/tls.h | 5 +++++ - 2 files changed, 10 insertions(+) + nptl/sysdeps/powerpc/tls.h | 5 +++++ + 1 file changed, 5 insertions(+) -diff --git glibc-2.17-c758a686/nptl/sysdeps/powerpc/tls.h glibc-2.17-c758a686/nptl/sysdeps/powerpc/tls.h -index 4c09eec..611c773 100644 ---- glibc-2.17-c758a686/nptl/sysdeps/powerpc/tls.h -+++ glibc-2.17-c758a686/nptl/sysdeps/powerpc/tls.h -@@ -61,6 +61,11 @@ typedef union dtv +--- a/nptl/sysdeps/powerpc/tls.h ++++ b/nptl/sysdeps/powerpc/tls.h +@@ -61,6 +61,11 @@ are private. */ typedef struct { @@ -26,6 +24,3 @@ index 4c09eec..611c773 100644 uintptr_t pointer_guard; uintptr_t stack_guard; dtv_t *dtv; --- -1.7.11.7 - diff --git a/packages/glibc/2.17/0020-glibc-rh731833-libm-3.patch b/packages/glibc/2.17/0020-glibc-rh731833-libm-3.patch index 89fe7a2..15e6010 100644 --- a/packages/glibc/2.17/0020-glibc-rh731833-libm-3.patch +++ b/packages/glibc/2.17/0020-glibc-rh731833-libm-3.patch @@ -7,18 +7,16 @@ This patch removes redudant definition from PowerPC specific math_ldbl, using the definitions from ieee754 math_ldbl.h. (backported from commit edf66e57fc2bac083ecc9756a5fe47f9041ed3bb) --- - sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 10 +- - sysdeps/powerpc/Implies | 1 + - sysdeps/powerpc/fpu/math_ldbl.h | 171 ++------------------------------ - sysdeps/unix/sysv/linux/powerpc/Implies | 4 - - 5 files changed, 34 insertions(+), 168 deletions(-) + sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 10 + + sysdeps/powerpc/Implies | 1 + sysdeps/powerpc/fpu/math_ldbl.h | 171 +------------------------------- + sysdeps/unix/sysv/linux/powerpc/Implies | 4 + 4 files changed, 18 insertions(+), 168 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/powerpc/Implies -diff --git glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h -index be9ac71..1cce1fc 100644 ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h -@@ -125,7 +125,7 @@ ldbl_insert_mantissa (int sign, int exp, int64_t hi64, u_int64_t lo64) +--- a/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ++++ b/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h +@@ -125,7 +125,7 @@ /* Handy utility functions to pack/unpack/cononicalize and find the nearbyint of long double implemented as double double. */ static inline long double @@ -27,7 +25,7 @@ index be9ac71..1cce1fc 100644 { union ibm_extended_long_double u; u.dd[0] = a; -@@ -134,7 +134,7 @@ ldbl_pack (double a, double aa) +@@ -134,7 +134,7 @@ } static inline void @@ -36,7 +34,7 @@ index be9ac71..1cce1fc 100644 { union ibm_extended_long_double u; u.d = l; -@@ -142,6 +142,12 @@ ldbl_unpack (long double l, double *a, double *aa) +@@ -142,6 +142,12 @@ *aa = u.dd[1]; } @@ -49,20 +47,16 @@ index be9ac71..1cce1fc 100644 /* Convert a finite long double to canonical form. Does not handle +/-Inf properly. */ -diff --git glibc-2.17-c758a686/sysdeps/powerpc/Implies glibc-2.17-c758a686/sysdeps/powerpc/Implies -index 7ccf9a7..78dba95 100644 ---- glibc-2.17-c758a686/sysdeps/powerpc/Implies -+++ glibc-2.17-c758a686/sysdeps/powerpc/Implies +--- a/sysdeps/powerpc/Implies ++++ b/sysdeps/powerpc/Implies @@ -1,4 +1,5 @@ # On PowerPC we use the IBM extended long double format. ieee754/ldbl-128ibm +ieee754/ldbl-opt ieee754/dbl-64 ieee754/flt-32 -diff --git glibc-2.17-c758a686/sysdeps/powerpc/fpu/math_ldbl.h glibc-2.17-c758a686/sysdeps/powerpc/fpu/math_ldbl.h -index 6cd6d0b..36378c0 100644 ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/math_ldbl.h -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/math_ldbl.h +--- a/sysdeps/powerpc/fpu/math_ldbl.h ++++ b/sysdeps/powerpc/fpu/math_ldbl.h @@ -2,132 +2,12 @@ #error "Never use directly; include instead." #endif @@ -201,7 +195,7 @@ index 6cd6d0b..36378c0 100644 { register long double x __asm__ ("fr1"); register double xh __asm__ ("fr1"); -@@ -139,7 +19,7 @@ ldbl_pack (double a, double aa) +@@ -139,7 +19,7 @@ } static inline void @@ -210,7 +204,7 @@ index 6cd6d0b..36378c0 100644 { register long double x __asm__ ("fr1"); register double xh __asm__ ("fr1"); -@@ -150,40 +30,7 @@ ldbl_unpack (long double l, double *a, double *aa) +@@ -150,40 +30,7 @@ *aa = xl; } @@ -254,16 +248,10 @@ index 6cd6d0b..36378c0 100644 - return a; -} +#include -diff --git glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Implies glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Implies -deleted file mode 100644 -index ff27cdb..0000000 ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Implies +--- a/sysdeps/unix/sysv/linux/powerpc/Implies +++ /dev/null @@ -1,4 +0,0 @@ -# Make sure these routines come before ldbl-opt. -ieee754/ldbl-128ibm -# These supply the ABI compatibility for when long double was double. -ieee754/ldbl-opt --- -1.7.11.7 - diff --git a/packages/glibc/2.17/0021-glibc-rh731833-libm-4.patch b/packages/glibc/2.17/0021-glibc-rh731833-libm-4.patch index a513494..ee6056b 100644 --- a/packages/glibc/2.17/0021-glibc-rh731833-libm-4.patch +++ b/packages/glibc/2.17/0021-glibc-rh731833-libm-4.patch @@ -15,9 +15,13 @@ Subject: [PATCH 21/42] PowerPC: fix libm ABI issue for llroundl (cherry picked from commit fce14d4e9c6e08ad8c825fe88d8cbdac5c739565) -diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c 2012-12-25 08:32:13.000000000 +0530 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c 2013-08-06 17:45:56.719534470 +0530 +--- + sysdeps/powerpc/fpu/s_llround.c | 4 ++++ + sysdeps/powerpc/fpu/w_sqrt.c | 4 ++++ + 2 files changed, 8 insertions(+) + +--- a/sysdeps/powerpc/fpu/s_llround.c ++++ b/sysdeps/powerpc/fpu/s_llround.c @@ -17,6 +17,7 @@ . */ @@ -26,16 +30,15 @@ diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c glibc-2.17-c758a6 /* I think that what this routine is supposed to do is round a value to the nearest integer, with values exactly on the boundary rounded -@@ -47,3 +48,6 @@ weak_alias (__llround, llround) +@@ -47,3 +48,6 @@ strong_alias (__llround, __llroundl) weak_alias (__llround, llroundl) #endif +#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_1) +compat_symbol (libm, __llround, llroundl, GLIBC_2_1); +#endif -diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/fpu/w_sqrt.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/w_sqrt.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/w_sqrt.c 2012-12-25 08:32:13.000000000 +0530 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/w_sqrt.c 2013-08-06 17:45:53.459534613 +0530 +--- a/sysdeps/powerpc/fpu/w_sqrt.c ++++ b/sysdeps/powerpc/fpu/w_sqrt.c @@ -19,6 +19,7 @@ #include #include @@ -44,7 +47,7 @@ diff -pruN glibc-2.17-c758a686/sysdeps/powerpc/fpu/w_sqrt.c glibc-2.17-c758a686/ double __sqrt (double x) /* wrapper sqrt */ -@@ -42,3 +43,6 @@ weak_alias (__sqrt, sqrt) +@@ -42,3 +43,6 @@ #ifdef NO_LONG_DOUBLE strong_alias (__sqrt, __sqrtl) weak_alias (__sqrt, sqrtl) #endif diff --git a/packages/glibc/2.17/0022-glibc-powerpc-ldbl_high.patch b/packages/glibc/2.17/0022-glibc-powerpc-ldbl_high.patch index 68faeee..fd0f439 100644 --- a/packages/glibc/2.17/0022-glibc-powerpc-ldbl_high.patch +++ b/packages/glibc/2.17/0022-glibc-powerpc-ldbl_high.patch @@ -1,7 +1,10 @@ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 2014-05-27 19:59:00.000000000 -0500 -@@ -190,6 +190,9 @@ +--- + sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ++++ b/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h +@@ -149,6 +149,9 @@ # define ldbl_unpack default_ldbl_unpack #endif diff --git a/packages/glibc/2.17/0023-glibc-ppc64le-01.patch b/packages/glibc/2.17/0023-glibc-ppc64le-01.patch index e2a86d7..062bd99 100644 --- a/packages/glibc/2.17/0023-glibc-ppc64le-01.patch +++ b/packages/glibc/2.17/0023-glibc-ppc64le-01.patch @@ -9,9 +9,13 @@ # machine specific Makefiles to define different abifiles names # (for instance *-le.abilist for powerpc64le). # -diff -urN glibc-2.17-c758a686/Makerules glibc-2.17-c758a686/Makerules ---- glibc-2.17-c758a686/Makerules 2014-06-02 15:29:42.000000000 +0000 -+++ glibc-2.17-c758a686/Makerules 2014-06-02 15:25:21.000000000 +0000 +--- +# Makerules | 32 ++++++++++++++++++++++++++++++++ +# sysdeps/powerpc/Makefile | 4 ++++ +# 2 files changed, 36 insertions(+) +# +--- a/Makerules ++++ b/Makerules @@ -1152,6 +1152,14 @@ LC_ALL=C $(OBJDUMP) --dynamic-syms $< > $@T mv -f $@T $@ @@ -70,9 +74,8 @@ diff -urN glibc-2.17-c758a686/Makerules glibc-2.17-c758a686/Makerules define update-abi @if cmp -s $^ 2> /dev/null; \ then \ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/Makefile glibc-2.17-c758a686/sysdeps/powerpc/Makefile ---- glibc-2.17-c758a686/sysdeps/powerpc/Makefile 2014-06-02 15:29:42.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/powerpc/Makefile 2014-06-02 15:25:21.000000000 +0000 +--- a/sysdeps/powerpc/Makefile ++++ b/sysdeps/powerpc/Makefile @@ -27,3 +27,7 @@ sysdep_headers += sys/platform/ppc.h tests += test-gettimebase diff --git a/packages/glibc/2.17/0024-glibc-ppc64le-02.patch b/packages/glibc/2.17/0024-glibc-ppc64le-02.patch index 3878826..8efe799 100644 --- a/packages/glibc/2.17/0024-glibc-ppc64le-02.patch +++ b/packages/glibc/2.17/0024-glibc-ppc64le-02.patch @@ -6,9 +6,24 @@ # # This patch is the abifiles for powerpc64le based on GLIBC 2.17. # -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld-le.abilist | 11 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale-le.abilist | 3 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl-le.abilist | 6 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc-le.abilist | 2168 ++++++++++ +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt-le.abilist | 9 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl-le.abilist | 11 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm-le.abilist | 402 + +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl-le.abilist | 123 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread-le.abilist | 224 + +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv-le.abilist | 93 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt-le.abilist | 37 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db-le.abilist | 42 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil-le.abilist | 8 +# 13 files changed, 3137 insertions(+) +# +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld-le.abilist @@ -0,0 +1,11 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -21,16 +36,14 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld- + free F + malloc F + realloc F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale-le.abilist @@ -0,0 +1,3 @@ +GLIBC_2.17 + GLIBC_2.17 A + __ctype_get_mb_cur_max F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl-le.abilist @@ -0,0 +1,6 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -38,9 +51,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + gai_error F + gai_suspend F + getaddrinfo_a F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc-le.abilist @@ -0,0 +1,2168 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -2210,9 +2222,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + xencrypt F + xprt_register F + xprt_unregister F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt-le.abilist @@ -0,0 +1,9 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -2223,9 +2234,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + fcrypt F + setkey F + setkey_r F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl-le.abilist @@ -0,0 +1,11 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -2238,9 +2248,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + dlopen F + dlsym F + dlvsym F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm-le.abilist @@ -0,0 +1,402 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -2644,9 +2653,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + yn F + ynf F + ynl F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl-le.abilist @@ -0,0 +1,123 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -2771,9 +2779,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + ypbinderr_string F + yperr_string F + ypprot_err F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread-le.abilist @@ -0,0 +1,224 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -2999,9 +3006,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + wait F + waitpid F + write F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv-le.abilist @@ -0,0 +1,93 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -3096,9 +3102,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + res_gethostbyname2 F + res_send_setqhook F + res_send_setrhook F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt-le.abilist @@ -0,0 +1,37 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -3137,9 +3142,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + timer_getoverrun F + timer_gettime F + timer_settime F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db-le.abilist @@ -0,0 +1,42 @@ +GLIBC_2.17 + GLIBC_2.17 A @@ -3183,9 +3187,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/lib + td_thr_tlsbase F + td_thr_tsd F + td_thr_validate F -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil-le.abilist glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil-le.abilist ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil-le.abilist 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil-le.abilist 2014-06-02 15:22:40.000000000 +0000 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil-le.abilist @@ -0,0 +1,8 @@ +GLIBC_2.17 + GLIBC_2.17 A diff --git a/packages/glibc/2.17/0025-glibc-ppc64le-03.patch b/packages/glibc/2.17/0025-glibc-ppc64le-03.patch index 40b6e71..24b5de9 100644 --- a/packages/glibc/2.17/0025-glibc-ppc64le-03.patch +++ b/packages/glibc/2.17/0025-glibc-ppc64le-03.patch @@ -4,9 +4,16 @@ # # Update miscellaneous scripts from upstream. # -diff -urN glibc-2.17-c758a686/scripts/config.guess glibc-2.17-c758a686/scripts/config.guess ---- glibc-2.17-c758a686/scripts/config.guess 2014-05-26 15:59:45.000000000 -0500 -+++ glibc-2.17-c758a686/scripts/config.guess 2014-05-26 16:01:00.000000000 -0500 +--- +# scripts/config.guess | 177 +++++++----- +# scripts/config.sub | 93 +++--- +# scripts/install-sh | 707 ++++++++++++++++++++++++++++++++++--------------- +# scripts/mkinstalldirs | 174 ++++++++++-- +# scripts/move-if-change | 92 +++++- +# 5 files changed, 874 insertions(+), 369 deletions(-) +# +--- a/scripts/config.guess ++++ b/scripts/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. @@ -320,9 +327,8 @@ diff -urN glibc-2.17-c758a686/scripts/config.guess glibc-2.17-c758a686/scripts/c echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) -diff -urN glibc-2.17-c758a686/scripts/config.sub glibc-2.17-c758a686/scripts/config.sub ---- glibc-2.17-c758a686/scripts/config.sub 2014-05-26 15:59:45.000000000 -0500 -+++ glibc-2.17-c758a686/scripts/config.sub 2014-05-26 16:00:52.000000000 -0500 +--- a/scripts/config.sub ++++ b/scripts/config.sub @@ -1,24 +1,18 @@ #! /bin/sh # Configuration validation subroutine script. @@ -578,9 +584,8 @@ diff -urN glibc-2.17-c758a686/scripts/config.sub glibc-2.17-c758a686/scripts/con or32-*) os=-coff ;; -diff -urN glibc-2.17-c758a686/scripts/install-sh glibc-2.17-c758a686/scripts/install-sh ---- glibc-2.17-c758a686/scripts/install-sh 2014-05-26 15:59:45.000000000 -0500 -+++ glibc-2.17-c758a686/scripts/install-sh 2014-05-26 16:00:34.000000000 -0500 +--- a/scripts/install-sh ++++ b/scripts/install-sh @@ -1,250 +1,527 @@ -#! /bin/sh -# @@ -1324,9 +1329,8 @@ diff -urN glibc-2.17-c758a686/scripts/install-sh glibc-2.17-c758a686/scripts/ins +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: -diff -urN glibc-2.17-c758a686/scripts/mkinstalldirs glibc-2.17-c758a686/scripts/mkinstalldirs ---- glibc-2.17-c758a686/scripts/mkinstalldirs 2014-05-26 15:59:45.000000000 -0500 -+++ glibc-2.17-c758a686/scripts/mkinstalldirs 2014-05-26 16:00:34.000000000 -0500 +--- a/scripts/mkinstalldirs ++++ b/scripts/mkinstalldirs @@ -1,38 +1,162 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy @@ -1515,9 +1519,8 @@ diff -urN glibc-2.17-c758a686/scripts/mkinstalldirs glibc-2.17-c758a686/scripts/ +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: -diff -urN glibc-2.17-c758a686/scripts/move-if-change glibc-2.17-c758a686/scripts/move-if-change ---- glibc-2.17-c758a686/scripts/move-if-change 2014-05-26 15:59:45.000000000 -0500 -+++ glibc-2.17-c758a686/scripts/move-if-change 2014-05-26 16:00:34.000000000 -0500 +--- a/scripts/move-if-change ++++ b/scripts/move-if-change @@ -1,17 +1,83 @@ #!/bin/sh # Like mv $1 $2, but if the files are the same, just delete $1. diff --git a/packages/glibc/2.17/0026-glibc-ppc64le-04.patch b/packages/glibc/2.17/0026-glibc-ppc64le-04.patch index 8f6840b..2b7a713 100644 --- a/packages/glibc/2.17/0026-glibc-ppc64le-04.patch +++ b/packages/glibc/2.17/0026-glibc-ppc64le-04.patch @@ -24,9 +24,21 @@ # * sysdeps/ieee754/ldbl-128ibm/strtold_l.c: Likewise. # * sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c 2014-05-26 21:08:10.000000000 -0500 +--- +# sysdeps/ieee754/ldbl-128ibm/e_exp10l.c | 6 +- +# sysdeps/ieee754/ldbl-128ibm/e_expl.c | 34 ++++++++-------- +# sysdeps/ieee754/ldbl-128ibm/ieee754.h | 26 +----------- +# sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c | 20 ++++----- +# sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 60 ++++++++++++++--------------- +# sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c | 36 ++++++++--------- +# sysdeps/ieee754/ldbl-128ibm/printf_fphex.c | 32 +++++++-------- +# sysdeps/ieee754/ldbl-128ibm/s_nearbyintl.c | 54 +++++++++++++------------- +# sysdeps/ieee754/ldbl-128ibm/strtold_l.c | 11 ++--- +# sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c | 26 ++++++------ +# 10 files changed, 142 insertions(+), 163 deletions(-) +# +--- a/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c @@ -36,9 +36,9 @@ else if (arg > LDBL_MAX_10_EXP + 1) return LDBL_MAX * LDBL_MAX; @@ -40,9 +52,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c glibc-2.17- exp_high = arg_high * log10_high; exp_low = arg_high * log10_low + arg_low * M_LN10l; return __ieee754_expl (exp_high) * __ieee754_expl (exp_low); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_expl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_expl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_expl.c 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_expl.c 2014-05-26 21:08:10.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_expl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_expl.c @@ -162,39 +162,39 @@ x = x + xl; @@ -116,9 +127,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_expl.c glibc-2.17-c7 } /* Exceptional cases: */ else if (isless (x, himark)) -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h 2014-05-26 21:08:10.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/ieee754.h ++++ b/sysdeps/ieee754/ldbl-128ibm/ieee754.h @@ -180,29 +180,9 @@ union ibm_extended_long_double @@ -152,9 +162,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h glibc-2.17-c __END_DECLS -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c 2014-05-26 21:08:10.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c ++++ b/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c @@ -36,22 +36,22 @@ union ibm_extended_long_double u; unsigned long long hi, lo; @@ -205,9 +214,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c glibc-2.17- { /* A biased exponent of zero is a special case. Either it is a zero or it is a denormal number. */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 2014-05-26 21:08:10.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ++++ b/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h @@ -14,28 +14,28 @@ as bit 53 of the mantissa. */ uint64_t hi, lo; @@ -338,9 +346,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h glibc-2.17 } #ifndef ldbl_pack -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c 2014-05-26 21:08:10.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c @@ -34,11 +34,11 @@ unsigned long long hi, lo; int exponent2; @@ -415,9 +422,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c glibc-2.17- - return u.d; + return u.ld; } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c 2014-05-26 21:08:10.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c ++++ b/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c @@ -27,31 +27,31 @@ unsigned long long int num0, num1; \ unsigned long long hi, lo; \ @@ -503,9 +509,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c glibc-2 } \ } while (0) -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nearbyintl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nearbyintl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nearbyintl.c 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nearbyintl.c 2014-05-26 21:08:10.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_nearbyintl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_nearbyintl.c @@ -33,11 +33,11 @@ fenv_t env; static const long double TWO52 = 4503599627370496.0L; @@ -613,9 +618,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nearbyintl.c glibc-2 } long_double_symbol (libm, __nearbyintl, nearbyintl); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/strtold_l.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/strtold_l.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/strtold_l.c 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/strtold_l.c 2014-05-26 21:12:01.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/strtold_l.c ++++ b/sysdeps/ieee754/ldbl-128ibm/strtold_l.c @@ -43,12 +43,11 @@ #define FLOAT_HUGE_VAL HUGE_VALL # define SET_MANTISSA(flt, mant) \ @@ -634,9 +638,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/strtold_l.c glibc-2.17 } while (0) #include -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c 2014-05-26 21:08:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c 2014-05-26 21:08:10.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c ++++ b/sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c @@ -89,23 +89,23 @@ double vals[12]; SET_RESTORE_ROUND (FE_TONEAREST); diff --git a/packages/glibc/2.17/0027-glibc-ppc64le-05.patch b/packages/glibc/2.17/0027-glibc-ppc64le-05.patch index d089fda..9363f34 100644 --- a/packages/glibc/2.17/0027-glibc-ppc64le-05.patch +++ b/packages/glibc/2.17/0027-glibc-ppc64le-05.patch @@ -56,9 +56,16 @@ # (__mpn_construct_long_double): Fix test for overflow of high # mantissa and correct normalisation. Avoid undefined shift. # -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c 2014-05-27 19:13:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c 2014-05-27 19:14:45.000000000 -0500 +--- +# sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c | 2 +# sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c | 34 +++-- +# sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 167 ++++++++++++++++++----------- +# sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c | 44 +++---- +# sysdeps/ieee754/ldbl-128ibm/printf_fphex.c | 14 +- +# 5 files changed, 155 insertions(+), 106 deletions(-) +# +--- a/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c @@ -243,7 +243,7 @@ We split the 113 bits of the mantissa into 5 24bit integers stored in a double array. */ @@ -68,9 +75,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c glibc-2. ldbl_extract_mantissa (&ixd, &lxd, &exp, x); exp = exp - 23; /* This is faster than doing this in floating point, because we -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c 2014-05-27 19:13:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c 2014-05-27 19:14:45.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c ++++ b/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c @@ -36,6 +36,7 @@ union ibm_extended_long_double u; unsigned long long hi, lo; @@ -128,9 +134,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c glibc-2.17- { /* we have a borrow from the hidden bit, so shift left 1. */ hi = 0x0ffffffffffffeLL | (lo >> 51); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 2014-05-27 19:13:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 2014-05-27 19:51:13.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ++++ b/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h @@ -13,77 +13,118 @@ the number before the decimal point and the second implicit bit as bit 53 of the mantissa. */ @@ -353,7 +358,7 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h glibc-2.17 static inline void default_ldbl_unpack (long double l, double *a, double *aa) { -@@ -162,13 +203,13 @@ +@@ -165,13 +206,13 @@ *aa = xl; } @@ -369,9 +374,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h glibc-2.17 if (__builtin_expect ((__builtin_fabs (a) < two52), 1)) { -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c 2014-05-27 19:13:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c 2014-05-27 19:14:45.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c @@ -70,9 +70,9 @@ else lzcount = __builtin_clzl ((long) val) + 32; @@ -458,9 +462,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c glibc-2.17- return u.ld; } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c 2014-05-27 19:13:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c 2014-05-27 19:14:45.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c ++++ b/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c @@ -43,15 +43,15 @@ lo <<= 1; \ /* The lower double is normalized separately from the upper. We \ diff --git a/packages/glibc/2.17/0028-glibc-ppc64le-06.patch b/packages/glibc/2.17/0028-glibc-ppc64le-06.patch index fe7cf61..c94079d 100644 --- a/packages/glibc/2.17/0028-glibc-ppc64le-06.patch +++ b/packages/glibc/2.17/0028-glibc-ppc64le-06.patch @@ -27,9 +27,20 @@ # ports/ # * sysdeps/ia64/fpu/printf_fphex.c: Adjust for fpnum change. # -diff -urN glibc-2.17-c758a686/math/test-misc.c glibc-2.17-c758a686/math/test-misc.c ---- glibc-2.17-c758a686/math/test-misc.c 2014-05-27 19:53:22.000000000 -0500 -+++ glibc-2.17-c758a686/math/test-misc.c 2014-05-27 19:53:45.000000000 -0500 +--- +# math/test-misc.c | 289 +++++++---------------------- +# ports/sysdeps/ia64/fpu/printf_fphex.c | 10 - +# stdio-common/printf_fp.c | 3 +# stdio-common/printf_fphex.c | 14 - +# stdio-common/printf_size.c | 12 - +# sysdeps/ieee754/ldbl-128/printf_fphex.c | 14 - +# sysdeps/ieee754/ldbl-128ibm/printf_fphex.c | 4 +# sysdeps/ieee754/ldbl-96/printf_fphex.c | 8 +# sysdeps/x86_64/fpu/printf_fphex.c | 9 +# 9 files changed, 113 insertions(+), 250 deletions(-) +# +--- a/math/test-misc.c ++++ b/math/test-misc.c @@ -721,300 +721,161 @@ #ifndef NO_LONG_DOUBLE @@ -406,9 +417,8 @@ diff -urN glibc-2.17-c758a686/math/test-misc.c glibc-2.17-c758a686/math/test-mis result = 1; } -diff -urN glibc-2.17-c758a686/ports/sysdeps/ia64/fpu/printf_fphex.c glibc-2.17-c758a686/ports/sysdeps/ia64/fpu/printf_fphex.c ---- glibc-2.17-c758a686/ports/sysdeps/ia64/fpu/printf_fphex.c 2014-05-27 19:53:21.000000000 -0500 -+++ glibc-2.17-c758a686/ports/sysdeps/ia64/fpu/printf_fphex.c 2014-05-27 19:53:45.000000000 -0500 +--- a/ports/sysdeps/ia64/fpu/printf_fphex.c ++++ b/ports/sysdeps/ia64/fpu/printf_fphex.c @@ -25,9 +25,11 @@ /* The "strange" 80 bit format on ia64 has an explicit \ leading digit in the 64 bit mantissa. */ \ @@ -434,9 +444,8 @@ diff -urN glibc-2.17-c758a686/ports/sysdeps/ia64/fpu/printf_fphex.c glibc-2.17-c if (exponent == 0) \ { \ if (zero_mantissa) \ -diff -urN glibc-2.17-c758a686/stdio-common/printf_fp.c glibc-2.17-c758a686/stdio-common/printf_fp.c ---- glibc-2.17-c758a686/stdio-common/printf_fp.c 2014-05-27 19:53:22.000000000 -0500 -+++ glibc-2.17-c758a686/stdio-common/printf_fp.c 2014-05-27 19:53:45.000000000 -0500 +--- a/stdio-common/printf_fp.c ++++ b/stdio-common/printf_fp.c @@ -335,8 +335,7 @@ int res; if (__isnanl (fpnum.ldbl)) @@ -447,9 +456,8 @@ diff -urN glibc-2.17-c758a686/stdio-common/printf_fp.c glibc-2.17-c758a686/stdio if (isupper (info->spec)) { special = "NAN"; -diff -urN glibc-2.17-c758a686/stdio-common/printf_fphex.c glibc-2.17-c758a686/stdio-common/printf_fphex.c ---- glibc-2.17-c758a686/stdio-common/printf_fphex.c 2014-05-27 19:53:22.000000000 -0500 -+++ glibc-2.17-c758a686/stdio-common/printf_fphex.c 2014-05-27 19:53:45.000000000 -0500 +--- a/stdio-common/printf_fphex.c ++++ b/stdio-common/printf_fphex.c @@ -93,7 +93,7 @@ union { @@ -497,9 +505,8 @@ diff -urN glibc-2.17-c758a686/stdio-common/printf_fphex.c glibc-2.17-c758a686/st } else #endif /* no long double */ -diff -urN glibc-2.17-c758a686/stdio-common/printf_size.c glibc-2.17-c758a686/stdio-common/printf_size.c ---- glibc-2.17-c758a686/stdio-common/printf_size.c 2014-05-27 19:53:22.000000000 -0500 -+++ glibc-2.17-c758a686/stdio-common/printf_size.c 2014-05-27 19:53:45.000000000 -0500 +--- a/stdio-common/printf_size.c ++++ b/stdio-common/printf_size.c @@ -103,7 +103,7 @@ union { @@ -540,9 +547,8 @@ diff -urN glibc-2.17-c758a686/stdio-common/printf_size.c glibc-2.17-c758a686/std ++tag; } } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128/printf_fphex.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128/printf_fphex.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128/printf_fphex.c 2014-05-27 19:53:20.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128/printf_fphex.c 2014-05-27 19:53:45.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128/printf_fphex.c ++++ b/sysdeps/ieee754/ldbl-128/printf_fphex.c @@ -24,13 +24,15 @@ digits we use only the implicit digits for the number before \ the decimal point. */ \ @@ -575,9 +581,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128/printf_fphex.c glibc-2.17 \ if (exponent == 0) \ { \ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c 2014-05-27 19:53:20.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c 2014-05-27 19:53:45.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c ++++ b/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c @@ -28,14 +28,14 @@ unsigned long long hi, lo; \ int ediff; \ @@ -595,9 +600,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c glibc-2 53rd bit. */ \ if (u.d[1].ieee.exponent != 0) \ lo |= (1ULL << (52 + 7)); \ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-96/printf_fphex.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-96/printf_fphex.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-96/printf_fphex.c 2014-05-27 19:53:20.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-96/printf_fphex.c 2014-05-27 19:53:45.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-96/printf_fphex.c ++++ b/sysdeps/ieee754/ldbl-96/printf_fphex.c @@ -25,11 +25,13 @@ /* The "strange" 80 bit format on ix86 and m68k has an explicit \ leading digit in the 64 bit mantissa. */ \ @@ -623,9 +627,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-96/printf_fphex.c glibc-2.17- \ if (exponent == 0) \ { \ -diff -urN glibc-2.17-c758a686/sysdeps/x86_64/fpu/printf_fphex.c glibc-2.17-c758a686/sysdeps/x86_64/fpu/printf_fphex.c ---- glibc-2.17-c758a686/sysdeps/x86_64/fpu/printf_fphex.c 2014-05-27 19:53:20.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/x86_64/fpu/printf_fphex.c 2014-05-27 19:53:45.000000000 -0500 +--- a/sysdeps/x86_64/fpu/printf_fphex.c ++++ b/sysdeps/x86_64/fpu/printf_fphex.c @@ -25,10 +25,11 @@ /* The "strange" 80 bit format on ix86 and m68k has an explicit \ leading digit in the 64 bit mantissa. */ \ diff --git a/packages/glibc/2.17/0029-glibc-ppc64le-07.patch b/packages/glibc/2.17/0029-glibc-ppc64le-07.patch index 120576e..eff61d3 100644 --- a/packages/glibc/2.17/0029-glibc-ppc64le-07.patch +++ b/packages/glibc/2.17/0029-glibc-ppc64le-07.patch @@ -42,9 +42,35 @@ # * sysdeps/ieee754/ldbl-128ibm/s_tanl.c (__tanl): Likewise. # * sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c (__logbl): Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c 2014-05-27 19:59:00.000000000 -0500 +--- +# sysdeps/ieee754/ldbl-128ibm/e_acoshl.c | 8 ++++- +# sysdeps/ieee754/ldbl-128ibm/e_acosl.c | 36 ++++++++++++------------- +# sysdeps/ieee754/ldbl-128ibm/e_asinl.c | 26 +++++++----------- +# sysdeps/ieee754/ldbl-128ibm/e_atanhl.c | 6 ++-- +# sysdeps/ieee754/ldbl-128ibm/e_coshl.c | 4 ++ +# sysdeps/ieee754/ldbl-128ibm/e_log2l.c | 8 +++-- +# sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c | 5 ++- +# sysdeps/ieee754/ldbl-128ibm/e_sinhl.c | 4 ++ +# sysdeps/ieee754/ldbl-128ibm/k_cosl.c | 10 ++++-- +# sysdeps/ieee754/ldbl-128ibm/k_sincosl.c | 12 +++++--- +# sysdeps/ieee754/ldbl-128ibm/k_sinl.c | 8 ++++- +# sysdeps/ieee754/ldbl-128ibm/s_asinhl.c | 5 ++- +# sysdeps/ieee754/ldbl-128ibm/s_atanl.c | 15 ++++------ +# sysdeps/ieee754/ldbl-128ibm/s_cosl.c | 4 ++ +# sysdeps/ieee754/ldbl-128ibm/s_fabsl.c | 10 +++++- +# sysdeps/ieee754/ldbl-128ibm/s_finitel.c | 12 +++++--- +# sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c | 5 ++- +# sysdeps/ieee754/ldbl-128ibm/s_isnanl.c | 14 +++++---- +# sysdeps/ieee754/ldbl-128ibm/s_logbl.c | 5 ++- +# sysdeps/ieee754/ldbl-128ibm/s_signbitl.c | 4 ++ +# sysdeps/ieee754/ldbl-128ibm/s_sincosl.c | 4 ++ +# sysdeps/ieee754/ldbl-128ibm/s_sinl.c | 4 ++ +# sysdeps/ieee754/ldbl-128ibm/s_tanl.c | 4 ++ +# sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c | 8 ++--- +# 24 files changed, 134 insertions(+), 87 deletions(-) +# +--- a/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c @@ -36,8 +36,12 @@ { long double t; @@ -60,9 +86,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acoshl.c glibc-2.17- if(hx<0x3ff0000000000000LL) { /* x < 1 */ return (x-x)/(x-x); } else if(hx >=0x41b0000000000000LL) { /* x > 2**28 */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acosl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acosl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acosl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acosl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_acosl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_acosl.c @@ -151,26 +151,25 @@ long double __ieee754_acosl (long double x) @@ -147,9 +172,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_acosl.c glibc-2.17-c w = w - f2 * f2; w = w / (2.0 * s); /* Arcsine of s. */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_asinl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_asinl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_asinl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_asinl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_asinl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_asinl.c @@ -131,19 +131,18 @@ long double __ieee754_asinl (long double x) @@ -217,9 +241,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_asinl.c glibc-2.17-c c = (t - w * w) / (s + w); r = p / q; p = 2.0 * s * r - (pio2_lo - 2.0 * c); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c @@ -40,8 +40,10 @@ { long double t; @@ -233,9 +256,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atanhl.c glibc-2.17- ix = hx&0x7fffffffffffffffLL; if (ix >= 0x3ff0000000000000LL) { /* |x|>=1 */ if (ix > 0x3ff0000000000000LL) -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_coshl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_coshl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_coshl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_coshl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_coshl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_coshl.c @@ -41,9 +41,11 @@ { long double t,w; @@ -249,9 +271,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_coshl.c glibc-2.17-c ix &= 0x7fffffffffffffffLL; /* x is INF or NaN */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log2l.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log2l.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log2l.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log2l.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_log2l.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_log2l.c @@ -177,11 +177,13 @@ long double z; long double y; @@ -269,9 +290,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log2l.c glibc-2.17-c return (-1.0L / (x - x)); if (hx < 0) return (x - x) / (x - x); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c @@ -200,10 +200,11 @@ double tx[8]; int exp; @@ -286,9 +306,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c glibc-2. ix = hx & 0x7fffffffffffffffLL; if (ix <= 0x3fe921fb54442d10LL) /* x in <-pi/4, pi/4> */ { -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c @@ -38,9 +38,11 @@ { long double t,w,h; @@ -302,9 +321,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_sinhl.c glibc-2.17-c ix = jx&0x7fffffffffffffffLL; /* x is INF or NaN */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_cosl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_cosl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_cosl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_cosl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/k_cosl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/k_cosl.c @@ -81,8 +81,11 @@ { long double h, l, z, sin_l, cos_l_m1; @@ -329,9 +347,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_cosl.c glibc-2.17-c7 l = y - (h - x); z = l * l; sin_l = l*(ONE+z*(SSIN1+z*(SSIN2+z*(SSIN3+z*(SSIN4+z*SSIN5))))); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c @@ -100,9 +100,12 @@ { long double h, l, z, sin_l, cos_l_m1; @@ -358,9 +375,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sincosl.c glibc-2.17 if (iy) l = y - (h - x); else -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sinl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sinl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sinl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sinl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/k_sinl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/k_sinl.c @@ -82,7 +82,10 @@ long double h, l, z, sin_l, cos_l_m1; int64_t ix; @@ -383,9 +399,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_sinl.c glibc-2.17-c7 if (iy) l = (ix < 0 ? -y : y) - (h - x); else -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c @@ -38,7 +38,10 @@ { long double t,w; @@ -398,9 +413,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_asinhl.c glibc-2.17- ix = hx&0x7fffffffffffffffLL; if(ix>=0x7ff0000000000000LL) return x+x; /* x is inf or NaN */ if(ix< 0x3e20000000000000LL) { /* |x|<2**-29 */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_atanl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_atanl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_atanl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_atanl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_atanl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_atanl.c @@ -173,23 +173,20 @@ long double __atanl (long double x) @@ -431,9 +445,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_atanl.c glibc-2.17-c return (x + x); /* Infinity. */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_cosl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_cosl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_cosl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_cosl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_cosl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_cosl.c @@ -53,9 +53,11 @@ { long double y[2],z=0.0L; @@ -447,9 +460,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_cosl.c glibc-2.17-c7 /* |x| ~< pi/4 */ ix &= 0x7fffffffffffffffLL; -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c @@ -29,10 +29,16 @@ long double __fabsl(long double x) { @@ -469,9 +481,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c glibc-2.17-c return x; } long_double_symbol (libm, __fabsl, fabsl); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_finitel.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_finitel.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_finitel.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_finitel.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_finitel.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_finitel.c @@ -29,10 +29,14 @@ int ___finitel (long double x) @@ -491,9 +502,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_finitel.c glibc-2.17 } hidden_ver (___finitel, __finitel) weak_alias (___finitel, ____finitel) -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c @@ -46,8 +46,10 @@ { u_int64_t hx, lx; @@ -514,9 +524,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c glibc- if ((lx & 0x7fffffffffffffff) /* lower is non-zero */ && ((lx^hx) & 0x8000000000000000ULL)) { /* and sign differs */ /* +/- denormal */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c 2014-05-27 19:59:00.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c @@ -29,12 +29,14 @@ int ___isnanl (long double x) @@ -538,9 +547,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c glibc-2.17- } hidden_ver (___isnanl, __isnanl) #ifndef IS_IN_libm -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_logbl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_logbl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_logbl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_logbl.c 2014-05-27 19:59:19.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_logbl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_logbl.c @@ -27,9 +27,10 @@ __logbl (long double x) { @@ -554,9 +562,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_logbl.c glibc-2.17-c hx &= 0x7fffffffffffffffLL; /* high |x| */ if (hx == 0) return -1.0 / fabs (x); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c 2014-05-27 19:59:19.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c @@ -25,8 +25,10 @@ ___signbitl (long double x) { @@ -569,9 +576,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c glibc-2.1 return e < 0; } #ifdef IS_IN_libm -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c 2014-05-27 19:59:19.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c @@ -27,9 +27,11 @@ __sincosl (long double x, long double *sinx, long double *cosx) { @@ -585,9 +591,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c glibc-2.17 /* |x| ~< pi/4 */ ix &= 0x7fffffffffffffffLL; -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sinl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sinl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sinl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sinl.c 2014-05-27 19:59:19.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_sinl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_sinl.c @@ -53,9 +53,11 @@ { long double y[2],z=0.0L; @@ -601,9 +606,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_sinl.c glibc-2.17-c7 /* |x| ~< pi/4 */ ix &= 0x7fffffffffffffffLL; -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanl.c 2014-05-27 19:59:19.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_tanl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_tanl.c @@ -53,9 +53,11 @@ { long double y[2],z=0.0L; @@ -617,9 +621,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanl.c glibc-2.17-c7 /* |x| ~< pi/4 */ ix &= 0x7fffffffffffffffLL; -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c 2014-05-27 19:58:07.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c 2014-05-27 19:59:19.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c ++++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c @@ -35,14 +35,14 @@ long double __logbl (long double x) diff --git a/packages/glibc/2.17/0030-glibc-ppc64le-08.patch b/packages/glibc/2.17/0030-glibc-ppc64le-08.patch index 5f79844..4e40482 100644 --- a/packages/glibc/2.17/0030-glibc-ppc64le-08.patch +++ b/packages/glibc/2.17/0030-glibc-ppc64le-08.patch @@ -47,9 +47,33 @@ # * sysdeps/ieee754/ldbl-128ibm/s_tanhl.c (__tanhl): Likewise. # * sysdeps/powerpc/fpu/libm-test-ulps: Adjust tan_towardzero ulps. # -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atan2l.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atan2l.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atan2l.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atan2l.c 2014-05-27 23:05:55.000000000 -0500 +--- +# sysdeps/ieee754/ldbl-128ibm/e_atan2l.c | 14 +- +# sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c | 7 - +# sysdeps/ieee754/ldbl-128ibm/e_ilogbl.c | 16 +-- +# sysdeps/ieee754/ldbl-128ibm/e_jnl.c | 32 +++--- +# sysdeps/ieee754/ldbl-128ibm/e_log10l.c | 8 + +# sysdeps/ieee754/ldbl-128ibm/e_logl.c | 32 +++--- +# sysdeps/ieee754/ldbl-128ibm/e_powl.c | 136 +++++++++++----------------- +# sysdeps/ieee754/ldbl-128ibm/k_tanl.c | 34 +++---- +# sysdeps/ieee754/ldbl-128ibm/s_expm1l.c | 12 +- +# sysdeps/ieee754/ldbl-128ibm/s_frexpl.c | 19 ++- +# sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c | 15 ++- +# sysdeps/ieee754/ldbl-128ibm/s_isinfl.c | 17 ++- +# sysdeps/ieee754/ldbl-128ibm/s_log1pl.c | 11 +- +# sysdeps/ieee754/ldbl-128ibm/s_modfl.c | 27 +++-- +# sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c | 57 +++++++---- +# sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c | 14 +- +# sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c | 8 - +# sysdeps/ieee754/ldbl-128ibm/s_remquol.c | 14 +- +# sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c | 21 +++- +# sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c | 21 +++- +# sysdeps/ieee754/ldbl-128ibm/s_tanhl.c | 8 + +# sysdeps/powerpc/fpu/libm-test-ulps | 3 +# 22 files changed, 287 insertions(+), 239 deletions(-) +# +--- a/sysdeps/ieee754/ldbl-128ibm/e_atan2l.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_atan2l.c @@ -56,11 +56,15 @@ { long double z; @@ -87,9 +111,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_atan2l.c glibc-2.17- /* when x is INF */ if(ix==0x7ff0000000000000LL) { -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c @@ -29,11 +29,12 @@ and the exp function. But due to the required boundary conditions we must check some values separately. */ @@ -106,9 +129,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c glibc-2.1 { /* Return value for x == 0 is Inf with divide by zero exception. */ *signgamp = 0; -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_ilogbl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_ilogbl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_ilogbl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_ilogbl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_ilogbl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_ilogbl.c @@ -31,26 +31,24 @@ int __ieee754_ilogbl(long double x) @@ -143,9 +165,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_ilogbl.c glibc-2.17- return INT_MAX; } return FP_ILOGBNAN; -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_jnl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_jnl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_jnl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_jnl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_jnl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_jnl.c @@ -70,26 +70,25 @@ long double __ieee754_jnl (int n, long double x) @@ -226,9 +247,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_jnl.c glibc-2.17-c75 a = temp; } } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log10l.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log10l.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log10l.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log10l.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_log10l.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_log10l.c @@ -182,11 +182,13 @@ long double z; long double y; @@ -246,9 +266,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_log10l.c glibc-2.17- return (-1.0L / (x - x)); if (hx < 0) return (x - x) / (x - x); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_logl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_logl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_logl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_logl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_logl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_logl.c @@ -185,18 +185,20 @@ long double __ieee754_logl(long double x) @@ -328,9 +347,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_logl.c glibc-2.17-c7 y += e * ln2a; return y; } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_powl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_powl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_powl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_powl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_powl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_powl.c @@ -151,37 +151,32 @@ long double y1, t1, t2, r, s, t, u, v, w; long double s2, s_h, s_l, t_h, t_l, ay; @@ -584,9 +602,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_powl.c glibc-2.17-c7 u = t * lg2_h; v = (p_l - (t - p_h)) * lg2 + t * lg2_l; z = u + v; -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_tanl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_tanl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_tanl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_tanl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/k_tanl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/k_tanl.c @@ -85,17 +85,17 @@ __kernel_tanl (long double x, long double y, int iy) { @@ -645,9 +662,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/k_tanl.c glibc-2.17-c7 + return z1 + z * (s + z1 * v); } } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_expm1l.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_expm1l.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_expm1l.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_expm1l.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_expm1l.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_expm1l.c @@ -92,19 +92,19 @@ __expm1l (long double x) { @@ -682,9 +698,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_expm1l.c glibc-2.17- return x; /* Overflow. */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c @@ -36,16 +36,21 @@ long double __frexpl(long double x, int *eptr) @@ -731,9 +746,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c glibc-2.17- return x; } #ifdef IS_IN_libm -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c @@ -1,6 +1,7 @@ /* * __isinf_nsl(x) returns != 0 if x is ±inf, else 0; @@ -761,9 +775,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c glibc-2. + mask >>= 63; + return ~mask; } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c @@ -11,6 +11,7 @@ /* * isinfl(x) returns 1 if x is inf, -1 if x is -inf, else 0; @@ -795,9 +808,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c glibc-2.17- } hidden_ver (___isinfl, __isinfl) #ifndef IS_IN_libm -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c @@ -126,19 +126,18 @@ __log1pl (long double xm1) { @@ -823,9 +835,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c glibc-2.17- return xm1; x = xm1 + 1.0L; -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_modfl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_modfl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_modfl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_modfl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_modfl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_modfl.c @@ -37,43 +37,54 @@ { int64_t i0,i1,j0; @@ -889,9 +900,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_modfl.c glibc-2.17-c return x - *iptr; } } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c @@ -30,27 +30,28 @@ long double __nextafterl(long double x, long double y) @@ -994,9 +1004,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c glibc-2 return x + u; } } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c 2014-05-27 23:10:26.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c @@ -34,23 +34,23 @@ { int32_t hx,ix; @@ -1028,9 +1037,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c glibc-2 u = math_opt_barrier (x); u = u * u; math_force_eval (u); /* raise underflow flag */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c @@ -27,16 +27,16 @@ { int32_t hx,ix; @@ -1052,9 +1060,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c glibc- /* y is nan */ return x+y; if((long double) x==y) return y; /* x=y, return y */ -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_remquol.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_remquol.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_remquol.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_remquol.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_remquol.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_remquol.c @@ -33,20 +33,24 @@ int64_t hx,hy; u_int64_t sx,lx,ly,qs; @@ -1085,9 +1092,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_remquol.c glibc-2.17 return (x * y) / (x * y); if (hy <= 0x7fbfffffffffffffLL) -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c 2014-05-27 23:15:30.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c @@ -41,11 +41,15 @@ { int64_t k,l,hx,lx; @@ -1139,9 +1145,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c glibc-2.1 return x*twolm54; } long_double_symbol (libm, __scalblnl, scalblnl); -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c 2014-05-27 23:16:25.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c @@ -41,11 +41,15 @@ { int64_t k,l,hx,lx; @@ -1193,9 +1198,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c glibc-2.17 return x*twolm54; } #ifdef IS_IN_libm -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanhl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanhl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanhl.c 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanhl.c 2014-05-27 23:05:55.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_tanhl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_tanhl.c @@ -47,10 +47,12 @@ long double __tanhl(long double x) { @@ -1220,9 +1224,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_tanhl.c glibc-2.17-c return x; /* x == +-0 */ if (ix<0x3c60000000000000LL) /* |x|<2**-57 */ return x*(one+x); /* tanh(small) = small */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/libm-test-ulps glibc-2.17-c758a686/sysdeps/powerpc/fpu/libm-test-ulps ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/libm-test-ulps 2014-05-27 23:05:51.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/libm-test-ulps 2014-05-27 23:08:26.000000000 -0500 +--- a/sysdeps/powerpc/fpu/libm-test-ulps ++++ b/sysdeps/powerpc/fpu/libm-test-ulps @@ -2641,6 +2641,9 @@ ifloat: 1 ildouble: 2 diff --git a/packages/glibc/2.17/0031-glibc-ppc64le-09.patch b/packages/glibc/2.17/0031-glibc-ppc64le-09.patch index 969d3a1..22ac662 100644 --- a/packages/glibc/2.17/0031-glibc-ppc64le-09.patch +++ b/packages/glibc/2.17/0031-glibc-ppc64le-09.patch @@ -42,9 +42,16 @@ # * math/libm-test.inc: Add tests for errors discovered in IBM long # double versions of fmodl, remainderl, erfl and erfcl. # -diff -urN glibc-2.17-c758a686/math/libm-test.inc glibc-2.17-c758a686/math/libm-test.inc ---- glibc-2.17-c758a686/math/libm-test.inc 2014-05-27 20:02:29.000000000 -0500 -+++ glibc-2.17-c758a686/math/libm-test.inc 2014-05-27 20:09:59.000000000 -0500 +--- +# math/libm-test.inc | 18 ++++ +# sysdeps/ieee754/ldbl-128ibm/e_fmodl.c | 127 +++++++++++++++-------------- +# sysdeps/ieee754/ldbl-128ibm/e_hypotl.c | 88 ++++++++++---------- +# sysdeps/ieee754/ldbl-128ibm/e_remainderl.c | 18 ++-- +# sysdeps/ieee754/ldbl-128ibm/s_erfl.c | 57 ++++++------- +# 5 files changed, 172 insertions(+), 136 deletions(-) +# +--- a/math/libm-test.inc ++++ b/math/libm-test.inc @@ -4040,6 +4040,10 @@ TEST_f_f (erf, 2.0L, 0.995322265018952734162069256367252929L); TEST_f_f (erf, 4.125L, 0.999999994576599200434933994687765914L); @@ -91,9 +98,8 @@ diff -urN glibc-2.17-c758a686/math/libm-test.inc glibc-2.17-c758a686/math/libm-t END (remainder); } -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c 2014-05-27 20:02:27.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c 2014-05-27 20:04:08.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c @@ -27,76 +27,83 @@ long double __ieee754_fmodl (long double x, long double y) @@ -254,9 +260,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c glibc-2.17-c return Zero[(u_int64_t)sx>>63]; while(hx<0x0001000000000000LL) { /* normalize x */ hx = hx+hx+(lx>>63); lx = lx+lx; -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_hypotl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_hypotl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_hypotl.c 2014-05-27 20:02:27.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_hypotl.c 2014-05-27 20:04:08.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_hypotl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_hypotl.c @@ -45,76 +45,84 @@ #include #include @@ -382,9 +387,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_hypotl.c glibc-2.17- } if(k!=0) return w*kld; -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c 2014-05-27 20:02:27.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c 2014-05-27 20:04:08.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c @@ -33,18 +33,22 @@ int64_t hx,hp; u_int64_t sx,lx,lp; @@ -424,9 +428,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c glibc-2 return x; } strong_alias (__ieee754_remainderl, __remainderl_finite) -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_erfl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_erfl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_erfl.c 2014-05-27 20:02:27.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/s_erfl.c 2014-05-27 20:04:08.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/s_erfl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/s_erfl.c @@ -760,16 +760,16 @@ __erfl (long double x) { diff --git a/packages/glibc/2.17/0032-glibc-ppc64le-10.patch b/packages/glibc/2.17/0032-glibc-ppc64le-10.patch index ae80fe6..8e1c1df 100644 --- a/packages/glibc/2.17/0032-glibc-ppc64le-10.patch +++ b/packages/glibc/2.17/0032-glibc-ppc64le-10.patch @@ -13,9 +13,13 @@ # * sysdeps/ieee754/ldbl-128ibm/math_ldbl.h: Don't include ieee854 # version of math_ldbl.h. # -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h 2014-05-27 22:10:43.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h 2014-05-27 22:11:10.000000000 -0500 +--- +# sysdeps/ieee754/ldbl-128ibm/ieee754.h | 55 -------------------------------- +# sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 1 +# 2 files changed, 56 deletions(-) +# +--- a/sysdeps/ieee754/ldbl-128ibm/ieee754.h ++++ b/sysdeps/ieee754/ldbl-128ibm/ieee754.h @@ -112,61 +112,6 @@ #define IEEE754_DOUBLE_BIAS 0x3ff /* Added to exponent. */ @@ -78,9 +82,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/ieee754.h glibc-2.17-c /* IBM extended format for long double. Each long double is made up of two IEEE doubles. The value of the -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 2014-05-27 22:10:43.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 2014-05-27 22:11:10.000000000 -0500 +--- a/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ++++ b/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h @@ -2,7 +2,6 @@ #error "Never use directly; include instead." #endif diff --git a/packages/glibc/2.17/0033-glibc-ppc64le-11.patch b/packages/glibc/2.17/0033-glibc-ppc64le-11.patch index ec12797..a168e37 100644 --- a/packages/glibc/2.17/0033-glibc-ppc64le-11.patch +++ b/packages/glibc/2.17/0033-glibc-ppc64le-11.patch @@ -12,9 +12,12 @@ # (t515, tm256): Double rather than long double. # (__ieee754_sqrtl): Rewrite using 64-bit arithmetic. # -diff -urN glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_sqrtl.c glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_sqrtl.c ---- glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_sqrtl.c 2014-05-27 22:20:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/ieee754/ldbl-128ibm/e_sqrtl.c 2014-05-27 22:21:39.000000000 -0500 +--- +# sysdeps/ieee754/ldbl-128ibm/e_sqrtl.c | 51 +++++++++++++++------------------- +# 1 file changed, 23 insertions(+), 28 deletions(-) +# +--- a/sysdeps/ieee754/ldbl-128ibm/e_sqrtl.c ++++ b/sysdeps/ieee754/ldbl-128ibm/e_sqrtl.c @@ -34,15 +34,13 @@ #include diff --git a/packages/glibc/2.17/0034-glibc-ppc64le-12.patch b/packages/glibc/2.17/0034-glibc-ppc64le-12.patch index 5e2d378..52e5b3c 100644 --- a/packages/glibc/2.17/0034-glibc-ppc64le-12.patch +++ b/packages/glibc/2.17/0034-glibc-ppc64le-12.patch @@ -11,9 +11,12 @@ # (lrint): Correct for little-endian. # (lrintf): Call lrint. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/bits/mathinline.h glibc-2.17-c758a686/sysdeps/powerpc/fpu/bits/mathinline.h ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/bits/mathinline.h 2014-05-27 22:28:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/bits/mathinline.h 2014-05-27 22:28:37.000000000 -0500 +--- +# sysdeps/powerpc/fpu/bits/mathinline.h | 26 ++++++++++++++------------ +# 1 file changed, 14 insertions(+), 12 deletions(-) +# +--- a/sysdeps/powerpc/fpu/bits/mathinline.h ++++ b/sysdeps/powerpc/fpu/bits/mathinline.h @@ -62,21 +62,28 @@ __MATH_INLINE int __NTH (__signbitf (float __x)) diff --git a/packages/glibc/2.17/0035-glibc-ppc64le-13.patch b/packages/glibc/2.17/0035-glibc-ppc64le-13.patch index 52830a1..345a19c 100644 --- a/packages/glibc/2.17/0035-glibc-ppc64le-13.patch +++ b/packages/glibc/2.17/0035-glibc-ppc64le-13.patch @@ -23,9 +23,25 @@ # * sysdeps/powerpc/fpu/fsetexcptflg.c (__fesetexceptflag): Adjust. # * sysdeps/powerpc/fpu/ftestexcept.c (fetestexcept): Adjust. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrt.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrt.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrt.c 2014-05-27 22:31:43.000000000 -0500 +--- +# sysdeps/powerpc/fpu/e_sqrt.c | 2 +- +# sysdeps/powerpc/fpu/e_sqrtf.c | 2 +- +# sysdeps/powerpc/fpu/fclrexcpt.c | 4 ++-- +# sysdeps/powerpc/fpu/fedisblxcpt.c | 10 +++++----- +# sysdeps/powerpc/fpu/feenablxcpt.c | 10 +++++----- +# sysdeps/powerpc/fpu/fegetexcept.c | 10 +++++----- +# sysdeps/powerpc/fpu/feholdexcpt.c | 5 ++--- +# sysdeps/powerpc/fpu/fenv_libc.h | 2 +- +# sysdeps/powerpc/fpu/fesetenv.c | 4 ++-- +# sysdeps/powerpc/fpu/feupdateenv.c | 6 +++--- +# sysdeps/powerpc/fpu/fgetexcptflg.c | 2 +- +# sysdeps/powerpc/fpu/fraiseexcpt.c | 12 ++++++------ +# sysdeps/powerpc/fpu/fsetexcptflg.c | 8 ++++---- +# sysdeps/powerpc/fpu/ftestexcept.c | 2 +- +# 14 files changed, 39 insertions(+), 40 deletions(-) +# +--- a/sysdeps/powerpc/fpu/e_sqrt.c ++++ b/sysdeps/powerpc/fpu/e_sqrt.c @@ -145,7 +145,7 @@ feraiseexcept (FE_INVALID_SQRT); @@ -35,9 +51,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.17-c758a686/s #endif feraiseexcept (FE_INVALID); x = a_nan.value; -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrtf.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrtf.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrtf.c 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/e_sqrtf.c ++++ b/sysdeps/powerpc/fpu/e_sqrtf.c @@ -121,7 +121,7 @@ feraiseexcept (FE_INVALID_SQRT); @@ -47,9 +62,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.17-c758a686/ #endif feraiseexcept (FE_INVALID); x = a_nan.value; -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fclrexcpt.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/fclrexcpt.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/fclrexcpt.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/fclrexcpt.c 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/fclrexcpt.c ++++ b/sysdeps/powerpc/fpu/fclrexcpt.c @@ -28,8 +28,8 @@ u.fenv = fegetenv_register (); @@ -61,9 +75,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fclrexcpt.c glibc-2.17-c758a68 /* Put the new state in effect. */ fesetenv_register (u.fenv); -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fedisblxcpt.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/fedisblxcpt.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/fedisblxcpt.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/fedisblxcpt.c 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/fedisblxcpt.c ++++ b/sysdeps/powerpc/fpu/fedisblxcpt.c @@ -32,15 +32,15 @@ fe.fenv = fegetenv_register (); @@ -85,9 +98,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fedisblxcpt.c glibc-2.17-c758a fesetenv_register (fe.fenv); new = __fegetexcept (); -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/feenablxcpt.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/feenablxcpt.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/feenablxcpt.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/feenablxcpt.c 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/feenablxcpt.c ++++ b/sysdeps/powerpc/fpu/feenablxcpt.c @@ -32,15 +32,15 @@ fe.fenv = fegetenv_register (); @@ -109,9 +121,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/feenablxcpt.c glibc-2.17-c758a fesetenv_register (fe.fenv); new = __fegetexcept (); -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fegetexcept.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/fegetexcept.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/fegetexcept.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/fegetexcept.c 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/fegetexcept.c ++++ b/sysdeps/powerpc/fpu/fegetexcept.c @@ -27,15 +27,15 @@ fe.fenv = fegetenv_register (); @@ -133,9 +144,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fegetexcept.c glibc-2.17-c758a result |= FE_INVALID; return result; -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/feholdexcpt.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/feholdexcpt.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/feholdexcpt.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/feholdexcpt.c 2014-05-27 22:33:09.000000000 -0500 +--- a/sysdeps/powerpc/fpu/feholdexcpt.c ++++ b/sysdeps/powerpc/fpu/feholdexcpt.c @@ -30,13 +30,12 @@ /* Clear everything except for the rounding modes and non-IEEE arithmetic @@ -152,9 +162,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/feholdexcpt.c glibc-2.17-c758a (void)__fe_mask_env (); /* Put the new state in effect. */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fenv_libc.h glibc-2.17-c758a686/sysdeps/powerpc/fpu/fenv_libc.h ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/fenv_libc.h 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/fenv_libc.h 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/fenv_libc.h ++++ b/sysdeps/powerpc/fpu/fenv_libc.h @@ -69,7 +69,7 @@ typedef union { @@ -164,9 +173,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fenv_libc.h glibc-2.17-c758a68 } fenv_union_t; -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fesetenv.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/fesetenv.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/fesetenv.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/fesetenv.c 2014-05-27 22:35:18.000000000 -0500 +--- a/sysdeps/powerpc/fpu/fesetenv.c ++++ b/sysdeps/powerpc/fpu/fesetenv.c @@ -36,14 +36,14 @@ exceptions, then unmask SIGFPE in the MSR FE0/FE1 bits. This will put the hardware into "precise mode" and may cause the FPU to run slower on some @@ -184,9 +192,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fesetenv.c glibc-2.17-c758a686 (void)__fe_mask_env (); fesetenv_register (*envp); -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/feupdateenv.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/feupdateenv.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/feupdateenv.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/feupdateenv.c 2014-05-27 22:34:23.000000000 -0500 +--- a/sysdeps/powerpc/fpu/feupdateenv.c ++++ b/sysdeps/powerpc/fpu/feupdateenv.c @@ -36,20 +36,20 @@ /* Restore rounding mode and exception enable from *envp and merge exceptions. Leave fraction rounded/inexact and FP result/CC bits @@ -211,9 +218,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/feupdateenv.c glibc-2.17-c758a (void)__fe_mask_env (); /* Atomically enable and raise (if appropriate) exceptions set in `new'. */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fgetexcptflg.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/fgetexcptflg.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/fgetexcptflg.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/fgetexcptflg.c 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/fgetexcptflg.c ++++ b/sysdeps/powerpc/fpu/fgetexcptflg.c @@ -28,7 +28,7 @@ u.fenv = fegetenv_register (); @@ -223,9 +229,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fgetexcptflg.c glibc-2.17-c758 /* Success. */ return 0; -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fraiseexcpt.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/fraiseexcpt.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/fraiseexcpt.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/fraiseexcpt.c 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/fraiseexcpt.c ++++ b/sysdeps/powerpc/fpu/fraiseexcpt.c @@ -34,11 +34,11 @@ u.fenv = fegetenv_register (); @@ -252,9 +257,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fraiseexcpt.c glibc-2.17-c758a set_fpscr_bit (FPSCR_VXSNAN); } -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fsetexcptflg.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/fsetexcptflg.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/fsetexcptflg.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/fsetexcptflg.c 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/fsetexcptflg.c ++++ b/sysdeps/powerpc/fpu/fsetexcptflg.c @@ -32,10 +32,10 @@ flag = *flagp & excepts; @@ -270,9 +274,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fsetexcptflg.c glibc-2.17-c758 /* Store the new status word (along with the rest of the environment). This may cause floating-point exceptions if the restored state -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/ftestexcept.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/ftestexcept.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/ftestexcept.c 2014-05-27 22:31:42.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/ftestexcept.c 2014-05-27 22:31:43.000000000 -0500 +--- a/sysdeps/powerpc/fpu/ftestexcept.c ++++ b/sysdeps/powerpc/fpu/ftestexcept.c @@ -28,6 +28,6 @@ /* The FE_INVALID bit is dealt with correctly by the hardware, so we can diff --git a/packages/glibc/2.17/0036-glibc-ppc64le-14.patch b/packages/glibc/2.17/0036-glibc-ppc64le-14.patch index 9025fd7..769d12b 100644 --- a/packages/glibc/2.17/0036-glibc-ppc64le-14.patch +++ b/packages/glibc/2.17/0036-glibc-ppc64le-14.patch @@ -15,9 +15,12 @@ # use vector int constants. # (__float_and_test24, __float_and8, __float_get_exp): Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_float_bitwise.h glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_float_bitwise.h ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_float_bitwise.h 2014-05-27 22:37:18.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_float_bitwise.h 2014-05-27 22:37:20.000000000 -0500 +--- +# sysdeps/powerpc/fpu/s_float_bitwise.h | 54 ++++++++++++++++++---------------- +# 1 file changed, 29 insertions(+), 25 deletions(-) +# +--- a/sysdeps/powerpc/fpu/s_float_bitwise.h ++++ b/sysdeps/powerpc/fpu/s_float_bitwise.h @@ -23,18 +23,19 @@ #include diff --git a/packages/glibc/2.17/0037-glibc-ppc64le-15.patch b/packages/glibc/2.17/0037-glibc-ppc64le-15.patch index 29b3b54..1acfede 100644 --- a/packages/glibc/2.17/0037-glibc-ppc64le-15.patch +++ b/packages/glibc/2.17/0037-glibc-ppc64le-15.patch @@ -20,9 +20,13 @@ # * sysdeps/powerpc/fpu/s_llround.c (__llround): Rewrite. # * sysdeps/powerpc/fpu/s_llroundf.c (__llroundf): Rewrite. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c 2014-05-27 22:38:55.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c 2014-05-27 22:38:58.000000000 -0500 +--- +# sysdeps/powerpc/fpu/s_llround.c | 33 ++++++++++++++++----------------- +# sysdeps/powerpc/fpu/s_llroundf.c | 33 ++++++++++++++++----------------- +# 2 files changed, 32 insertions(+), 34 deletions(-) +# +--- a/sysdeps/powerpc/fpu/s_llround.c ++++ b/sysdeps/powerpc/fpu/s_llround.c @@ -19,29 +19,28 @@ #include #include @@ -69,9 +73,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llround.c glibc-2.17-c758a68 } weak_alias (__llround, llround) #ifdef NO_LONG_DOUBLE -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llroundf.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llroundf.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llroundf.c 2014-05-27 22:38:55.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/s_llroundf.c 2014-05-27 22:38:58.000000000 -0500 +--- a/sysdeps/powerpc/fpu/s_llroundf.c ++++ b/sysdeps/powerpc/fpu/s_llroundf.c @@ -18,28 +18,27 @@ #include diff --git a/packages/glibc/2.17/0038-glibc-ppc64le-16.patch b/packages/glibc/2.17/0038-glibc-ppc64le-16.patch index 0da0865..3f4bfba 100644 --- a/packages/glibc/2.17/0038-glibc-ppc64le-16.patch +++ b/packages/glibc/2.17/0038-glibc-ppc64le-16.patch @@ -13,9 +13,13 @@ # * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (_GET_DI_FPSCR): Likewise. # (_SET_DI_FPSCR, _GET_SI_FPSCR, _SET_SI_FPSCR): Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fpu_control.h glibc-2.17-c758a686/sysdeps/powerpc/fpu/fpu_control.h ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/fpu_control.h 2014-05-27 22:40:18.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/fpu_control.h 2014-05-27 22:43:40.000000000 -0500 +--- +# sysdeps/powerpc/fpu/fpu_control.h | 32 ++++++----- +# sysdeps/powerpc/fpu/tst-setcontext-fpscr.c | 83 ++++++++++++++--------------- +# 2 files changed, 60 insertions(+), 55 deletions(-) +# +--- a/sysdeps/powerpc/fpu/fpu_control.h ++++ b/sysdeps/powerpc/fpu/fpu_control.h @@ -45,22 +45,26 @@ #define _FPU_IEEE 0x000000f0 @@ -57,9 +61,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/fpu_control.h glibc-2.17-c758a /* Default control word set at startup. */ extern fpu_control_t __fpu_control; -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c glibc-2.17-c758a686/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c 2014-05-27 22:40:18.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c 2014-05-27 22:40:21.000000000 -0500 +--- a/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c ++++ b/sysdeps/powerpc/fpu/tst-setcontext-fpscr.c @@ -83,7 +83,7 @@ return 0; } diff --git a/packages/glibc/2.17/0039-glibc-ppc64le-17.patch b/packages/glibc/2.17/0039-glibc-ppc64le-17.patch index 5ed69a9..204c09e 100644 --- a/packages/glibc/2.17/0039-glibc-ppc64le-17.patch +++ b/packages/glibc/2.17/0039-glibc-ppc64le-17.patch @@ -28,9 +28,30 @@ # * sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S: Use HISHORT. # * sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysign.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysign.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysign.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysign.S 2014-05-27 22:45:46.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/fpu/s_copysign.S | 2 +- +# sysdeps/powerpc/powerpc32/fpu/s_copysignl.S | 2 +- +# sysdeps/powerpc/powerpc32/fpu/s_lrint.S | 4 ++-- +# sysdeps/powerpc/powerpc32/fpu/s_lround.S | 2 +- +# sysdeps/powerpc/powerpc32/power4/fpu/s_llrint.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power4/fpu/s_llrintf.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power5+/fpu/s_llround.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power5+/fpu/s_lround.S | 2 +- +# sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power6/fpu/s_llrint.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power6/fpu/s_llrintf.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power6/fpu/s_llround.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S | 5 ++--- +# sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S | 7 +++---- +# sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S | 4 ++-- +# sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S | 6 ++---- +# sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S | 5 ++--- +# sysdeps/powerpc/sysdep.h | 15 +++++++++++++++ +# 19 files changed, 48 insertions(+), 38 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/fpu/s_copysign.S ++++ b/sysdeps/powerpc/powerpc32/fpu/s_copysign.S @@ -29,7 +29,7 @@ stwu r1,-16(r1) cfi_adjust_cfa_offset (16) @@ -40,9 +61,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysign.S glibc-2 cmpwi r3,0 addi r1,r1,16 cfi_adjust_cfa_offset (-16) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S ++++ b/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S @@ -30,7 +30,7 @@ fmr fp0,fp1 fabs fp1,fp1 @@ -52,9 +72,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S glibc- cmpwi cr6,r3,0 addi r1,r1,16 cfi_adjust_cfa_offset (-16) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lrint.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lrint.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lrint.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lrint.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/fpu/s_lrint.S ++++ b/sysdeps/powerpc/powerpc32/fpu/s_lrint.S @@ -24,10 +24,10 @@ stwu r1,-16(r1) fctiw fp13,fp1 @@ -68,9 +87,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lrint.S glibc-2.17 addi r1,r1,16 blr END (__lrint) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lround.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lround.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lround.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lround.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/fpu/s_lround.S ++++ b/sysdeps/powerpc/powerpc32/fpu/s_lround.S @@ -67,7 +67,7 @@ nop /* Ensure the following load is in a different dispatch */ nop /* group to avoid pipe stall on POWER4&5. */ @@ -80,9 +98,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_lround.S glibc-2.1 .Lout: addi r1,r1,16 blr -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrint.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrint.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrint.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrint.S 2014-05-27 22:48:09.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power4/fpu/s_llrint.S ++++ b/sysdeps/powerpc/powerpc32/power4/fpu/s_llrint.S @@ -29,8 +29,8 @@ nop /* Insure the following load is in a different dispatch group */ nop /* to avoid pipe stall on POWER4&5. */ @@ -94,9 +111,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrint.S gl addi r1,r1,16 blr END (__llrint) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrintf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrintf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrintf.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrintf.S 2014-05-27 22:48:44.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power4/fpu/s_llrintf.S ++++ b/sysdeps/powerpc/powerpc32/power4/fpu/s_llrintf.S @@ -28,8 +28,8 @@ nop /* Insure the following load is in a different dispatch group */ nop /* to avoid pipe stall on POWER4&5. */ @@ -108,9 +124,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llrintf.S g addi r1,r1,16 blr END (__llrintf) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S ++++ b/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S @@ -27,8 +27,8 @@ ori r1,r1,0 stfd fp1,24(r1) /* copy FPR to GPR */ @@ -122,9 +137,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S gli lis r0,0x7ff0 /* const long r0 0x7ff00000 00000000 */ clrlwi r4,r4,1 /* x = fabs(x) */ cmpw cr7,r4,r0 /* if (fabs(x) =< inf) */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_llround.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_llround.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_llround.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_llround.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power5+/fpu/s_llround.S ++++ b/sysdeps/powerpc/powerpc32/power5+/fpu/s_llround.S @@ -39,8 +39,8 @@ nop /* Ensure the following load is in a different dispatch */ nop /* group to avoid pipe stall on POWER4&5. */ @@ -136,9 +150,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_llround.S addi r1,r1,16 blr END (__llround) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_lround.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_lround.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_lround.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_lround.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power5+/fpu/s_lround.S ++++ b/sysdeps/powerpc/powerpc32/power5+/fpu/s_lround.S @@ -38,7 +38,7 @@ nop /* Ensure the following load is in a different dispatch */ nop /* group to avoid pipe stall on POWER4&5. */ @@ -148,9 +161,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power5+/fpu/s_lround.S g addi r1,r1,16 blr END (__lround) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S ++++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S @@ -27,8 +27,8 @@ ori r1,r1,0 stfd fp1,24(r1) /* copy FPR to GPR */ @@ -162,9 +174,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S gli lis r0,0x7ff0 /* const long r0 0x7ff00000 00000000 */ clrlwi r4,r4,1 /* x = fabs(x) */ cmpw cr7,r4,r0 /* if (fabs(x) =< inf) */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrint.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrint.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrint.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrint.S 2014-05-27 22:46:52.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power6/fpu/s_llrint.S ++++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_llrint.S @@ -29,8 +29,8 @@ /* Insure the following load is in a different dispatch group by inserting "group ending nop". */ @@ -176,9 +187,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrint.S gl addi r1,r1,16 blr END (__llrint) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrintf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrintf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrintf.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrintf.S 2014-05-27 22:47:29.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power6/fpu/s_llrintf.S ++++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_llrintf.S @@ -28,8 +28,8 @@ /* Insure the following load is in a different dispatch group by inserting "group ending nop". */ @@ -190,9 +200,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llrintf.S g addi r1,r1,16 blr END (__llrintf) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llround.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llround.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llround.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llround.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power6/fpu/s_llround.S ++++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_llround.S @@ -39,8 +39,8 @@ /* Insure the following load is in a different dispatch group by inserting "group ending nop". */ @@ -204,9 +213,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/fpu/s_llround.S g addi r1,r1,16 blr END (__llround) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S ++++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S @@ -54,9 +54,8 @@ stfd fp1,8(r1) /* Transfer FP to GPR's. */ @@ -219,9 +227,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S gl clrlwi r0,r0,17 /* r0 = abs(r0). */ addi r1,r1,16 /* Reset the stack pointer. */ cmpwi cr7,r0,0x7ff0 /* r4 == 0x7ff0?. */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S ++++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S @@ -48,14 +48,13 @@ li r3,0 bflr 29 /* If not INF, return. */ @@ -240,9 +247,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S gli addi r1,r1,16 /* Reset the stack pointer. */ cmpwi cr7,r4,0x7ff0 /* r4 == 0x7ff0? */ li r3,1 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S ++++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S @@ -53,8 +53,8 @@ stwu r1,-16(r1) /* Allocate stack space. */ stfd fp1,8(r1) /* Transfer FP to GPR's. */ @@ -254,9 +260,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S gli addi r1,r1,16 /* Reset the stack pointer. */ lis r0,0x7ff0 /* Load the upper portion for an INF/NaN. */ clrlwi r4,r4,1 /* r4 = abs(r4). */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S ++++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S @@ -39,10 +39,8 @@ stfd fp1,-16(r1) /* Transfer FP to GPR's. */ @@ -270,9 +275,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S gl clrlwi r4,r4,17 /* r4 = abs(r4). */ cmpwi cr7,r4,0x7ff0 /* r4 == 0x7ff0? */ bltlr cr7 /* LT means finite, other non-finite. */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S ++++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S @@ -38,9 +38,8 @@ stfd fp1,-16(r1) /* Transfer FP to GPR's. */ @@ -285,9 +289,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S gli cmpwi cr7,r4,0x7ff0 /* r4 == 0x7ff0? */ li r3,1 beqlr cr7 /* EQ means INF, otherwise -INF. */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/sysdep.h glibc-2.17-c758a686/sysdeps/powerpc/sysdep.h ---- glibc-2.17-c758a686/sysdeps/powerpc/sysdep.h 2014-05-27 22:45:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/sysdep.h 2014-05-27 22:45:46.000000000 -0500 +--- a/sysdeps/powerpc/sysdep.h ++++ b/sysdeps/powerpc/sysdep.h @@ -144,6 +144,21 @@ #define VRSAVE 256 diff --git a/packages/glibc/2.17/0040-glibc-ppc64le-18.patch b/packages/glibc/2.17/0040-glibc-ppc64le-18.patch index f5e327e..7ed51b9 100644 --- a/packages/glibc/2.17/0040-glibc-ppc64le-18.patch +++ b/packages/glibc/2.17/0040-glibc-ppc64le-18.patch @@ -12,9 +12,13 @@ # constant for 0x1p52. Load little-endian words of double from # correct stack offsets. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_roundf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_roundf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_roundf.S 2014-05-27 22:50:13.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_roundf.S 2014-05-27 22:50:13.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/fpu/s_roundf.S | 3 +-- +# sysdeps/powerpc/powerpc32/power4/fpu/s_llround.S | 20 +++++++++----------- +# 2 files changed, 10 insertions(+), 13 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/fpu/s_roundf.S ++++ b/sysdeps/powerpc/powerpc32/fpu/s_roundf.S @@ -19,7 +19,7 @@ #include @@ -32,9 +36,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/s_roundf.S glibc-2.1 lfs fp10,.LC1@l(r9) #endif ble- cr6,.L4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llround.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llround.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llround.S 2014-05-27 22:50:13.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/s_llround.S 2014-05-27 22:50:13.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power4/fpu/s_llround.S ++++ b/sysdeps/powerpc/powerpc32/power4/fpu/s_llround.S @@ -19,12 +19,10 @@ #include #include diff --git a/packages/glibc/2.17/0041-glibc-ppc64le-19.patch b/packages/glibc/2.17/0041-glibc-ppc64le-19.patch index bbf7228..9655e0b 100644 --- a/packages/glibc/2.17/0041-glibc-ppc64le-19.patch +++ b/packages/glibc/2.17/0041-glibc-ppc64le-19.patch @@ -15,9 +15,17 @@ # * sysdeps/powerpc/powerpc64/fpu/s_roundf.S: Likewise. # * sysdeps/powerpc/powerpc64/fpu/s_truncf.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_ceilf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_ceilf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_ceilf.S 2014-05-27 22:52:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_ceilf.S 2014-05-27 22:52:18.000000000 -0500 +--- +# sysdeps/powerpc/powerpc64/fpu/s_ceilf.S | 4 +++- +# sysdeps/powerpc/powerpc64/fpu/s_floorf.S | 4 +++- +# sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S | 4 +++- +# sysdeps/powerpc/powerpc64/fpu/s_rintf.S | 4 +++- +# sysdeps/powerpc/powerpc64/fpu/s_roundf.S | 6 ++++-- +# sysdeps/powerpc/powerpc64/fpu/s_truncf.S | 4 +++- +# 6 files changed, 19 insertions(+), 7 deletions(-) +# +--- a/sysdeps/powerpc/powerpc64/fpu/s_ceilf.S ++++ b/sysdeps/powerpc/powerpc64/fpu/s_ceilf.S @@ -19,8 +19,10 @@ #include @@ -30,9 +38,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_ceilf.S glibc-2.17 .section ".text" EALIGN (__ceilf, 4, 0) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_floorf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_floorf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_floorf.S 2014-05-27 22:52:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_floorf.S 2014-05-27 22:52:18.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/fpu/s_floorf.S ++++ b/sysdeps/powerpc/powerpc64/fpu/s_floorf.S @@ -19,8 +19,10 @@ #include @@ -45,9 +52,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_floorf.S glibc-2.1 .section ".text" EALIGN (__floorf, 4, 0) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S 2014-05-27 22:52:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S 2014-05-27 22:52:18.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S ++++ b/sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S @@ -26,8 +26,10 @@ /* float [fp1] nearbyintf(float [fp1]) */ @@ -60,9 +66,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S glibc .section ".text" EALIGN (__nearbyintf, 4, 0) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_rintf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_rintf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_rintf.S 2014-05-27 22:52:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_rintf.S 2014-05-27 22:52:18.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/fpu/s_rintf.S ++++ b/sysdeps/powerpc/powerpc64/fpu/s_rintf.S @@ -19,8 +19,10 @@ #include @@ -75,9 +80,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_rintf.S glibc-2.17 .section ".text" EALIGN (__rintf, 4, 0) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_roundf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_roundf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_roundf.S 2014-05-27 22:52:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_roundf.S 2014-05-27 22:52:18.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/fpu/s_roundf.S ++++ b/sysdeps/powerpc/powerpc64/fpu/s_roundf.S @@ -19,10 +19,12 @@ #include @@ -93,9 +97,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_roundf.S glibc-2.1 .section ".text" /* float [fp1] roundf (float x [fp1]) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_truncf.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_truncf.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_truncf.S 2014-05-27 22:52:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_truncf.S 2014-05-27 22:52:18.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/fpu/s_truncf.S ++++ b/sysdeps/powerpc/powerpc64/fpu/s_truncf.S @@ -19,8 +19,10 @@ #include diff --git a/packages/glibc/2.17/0042-glibc-ppc64le-20.patch b/packages/glibc/2.17/0042-glibc-ppc64le-20.patch index 1342f97..fe20d66 100644 --- a/packages/glibc/2.17/0042-glibc-ppc64le-20.patch +++ b/packages/glibc/2.17/0042-glibc-ppc64le-20.patch @@ -10,9 +10,12 @@ # * sysdeps/powerpc/powerpc32/power4/hp-timing.h (HP_TIMING_NOW): # Don't use a union to pack hi/low value. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/hp-timing.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/hp-timing.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/hp-timing.h 2014-05-27 22:53:37.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/hp-timing.h 2014-05-27 22:53:39.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/power4/hp-timing.h | 21 +++++++++------------ +# 1 file changed, 9 insertions(+), 12 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/power4/hp-timing.h ++++ b/sysdeps/powerpc/powerpc32/power4/hp-timing.h @@ -87,18 +87,15 @@ #define HP_TIMING_NOW(Var) \ diff --git a/packages/glibc/2.17/0043-glibc-ppc64le-21.patch b/packages/glibc/2.17/0043-glibc-ppc64le-21.patch index a945404..630b52a 100644 --- a/packages/glibc/2.17/0043-glibc-ppc64le-21.patch +++ b/packages/glibc/2.17/0043-glibc-ppc64le-21.patch @@ -26,9 +26,16 @@ # * sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise CR save. Don't # destroy vmx regs when saving unaligned. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/jmpbuf-offsets.h glibc-2.17-c758a686/sysdeps/powerpc/jmpbuf-offsets.h ---- glibc-2.17-c758a686/sysdeps/powerpc/jmpbuf-offsets.h 2014-05-27 22:55:23.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/jmpbuf-offsets.h 2014-05-27 22:55:27.000000000 -0500 +--- +# sysdeps/powerpc/jmpbuf-offsets.h | 6 - +# sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S | 8 +- +# sysdeps/powerpc/powerpc32/fpu/setjmp-common.S | 81 +++++++++++------------ +# sysdeps/powerpc/powerpc64/__longjmp-common.S | 4 - +# sysdeps/powerpc/powerpc64/setjmp-common.S | 80 ++++++++++------------ +# 5 files changed, 86 insertions(+), 93 deletions(-) +# +--- a/sysdeps/powerpc/jmpbuf-offsets.h ++++ b/sysdeps/powerpc/jmpbuf-offsets.h @@ -21,12 +21,10 @@ #define JB_LR 2 /* The address we will return to */ #if __WORDSIZE == 64 @@ -44,9 +51,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/jmpbuf-offsets.h glibc-2.17-c758a6 # define JB_VRS 40 /* VRs 20 through 31 are saved, 12*4 words total. */ #else # define JB_GPRS 3 /* GPRs 14 through 31 are saved, 18 in total. */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S 2014-05-27 22:55:23.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S 2014-05-27 22:55:27.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S ++++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S @@ -46,16 +46,16 @@ # endif mtlr r6 @@ -68,9 +74,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S g # endif andis. r5,r5,(PPC_FEATURE_HAS_ALTIVEC >> 16) beq L(no_vmx) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S 2014-05-27 22:55:23.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S 2014-05-27 22:55:27.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S ++++ b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S @@ -97,14 +97,14 @@ # else lwz r5,_rtld_global_ro@got(r5) @@ -171,9 +176,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S glib b L(no_vmx) L(aligned_save_vmx): -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S 2014-05-27 22:55:23.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S 2014-05-27 22:55:27.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/__longjmp-common.S ++++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S @@ -60,7 +60,7 @@ beq L(no_vmx) la r5,((JB_VRS)*8)(3) @@ -192,9 +196,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S glibc ld r23,((JB_GPRS+9)*8)(r3) lfd fp23,((JB_FPRS+9)*8)(r3) ld r24,((JB_GPRS+10)*8)(r3) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S 2014-05-27 22:55:23.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S 2014-05-27 22:55:27.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/setjmp-common.S ++++ b/sysdeps/powerpc/powerpc64/setjmp-common.S @@ -98,7 +98,7 @@ mfcr r0 std r16,((JB_GPRS+2)*8)(3) diff --git a/packages/glibc/2.17/0044-glibc-ppc64le-22.patch b/packages/glibc/2.17/0044-glibc-ppc64le-22.patch index 12a0ff0..657fbae 100644 --- a/packages/glibc/2.17/0044-glibc-ppc64le-22.patch +++ b/packages/glibc/2.17/0044-glibc-ppc64le-22.patch @@ -24,9 +24,21 @@ # * sysdeps/powerpc/powerpc64/setjmp.S: Likewise. # * nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c: Likewise. # -diff -urN glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c ---- glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c 2014-05-27 23:22:12.000000000 -0500 -+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c 2014-05-27 23:23:44.000000000 -0500 +--- +# nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c | 13 ++++--------- +# sysdeps/powerpc/longjmp.c | 6 +++--- +# sysdeps/powerpc/novmx-longjmp.c | 12 +++--------- +# sysdeps/powerpc/powerpc32/bsd-_setjmp.S | 4 ++-- +# sysdeps/powerpc/powerpc32/bsd-setjmp.S | 4 ++-- +# sysdeps/powerpc/powerpc32/fpu/__longjmp.S | 4 ++-- +# sysdeps/powerpc/powerpc32/fpu/setjmp.S | 4 ++-- +# sysdeps/powerpc/powerpc32/mcount.c | 2 +- +# sysdeps/powerpc/powerpc32/setjmp.S | 4 ++-- +# sysdeps/powerpc/powerpc64/setjmp.S | 12 ++++++------ +# 10 files changed, 27 insertions(+), 38 deletions(-) +# +--- a/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c ++++ b/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c @@ -41,13 +41,8 @@ __novmx__libc_longjmp (env, val); } @@ -51,9 +63,8 @@ diff -urN glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c -versioned_symbol (libc, __vmx_siglongjmp, siglongjmp, GLIBC_2_3_4); +versioned_symbol (libpthread, __vmx_longjmp, longjmp, GLIBC_2_3_4); +versioned_symbol (libpthread, __vmx_siglongjmp, siglongjmp, GLIBC_2_3_4); -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/longjmp.c glibc-2.17-c758a686/sysdeps/powerpc/longjmp.c ---- glibc-2.17-c758a686/sysdeps/powerpc/longjmp.c 2014-05-27 23:22:10.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/longjmp.c 2014-05-27 23:22:12.000000000 -0500 +--- a/sysdeps/powerpc/longjmp.c ++++ b/sysdeps/powerpc/longjmp.c @@ -56,6 +56,6 @@ default_symbol_version (__vmx__libc_longjmp, __libc_longjmp, GLIBC_PRIVATE); @@ -64,9 +75,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/longjmp.c glibc-2.17-c758a686/sysd +versioned_symbol (libc, __vmx_longjmp, _longjmp, GLIBC_2_3_4); +versioned_symbol (libc, __vmxlongjmp, longjmp, GLIBC_2_3_4); +versioned_symbol (libc, __vmxsiglongjmp, siglongjmp, GLIBC_2_3_4); -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/novmx-longjmp.c glibc-2.17-c758a686/sysdeps/powerpc/novmx-longjmp.c ---- glibc-2.17-c758a686/sysdeps/powerpc/novmx-longjmp.c 2014-05-27 23:22:10.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/novmx-longjmp.c 2014-05-27 23:22:12.000000000 -0500 +--- a/sysdeps/powerpc/novmx-longjmp.c ++++ b/sysdeps/powerpc/novmx-longjmp.c @@ -51,13 +51,7 @@ weak_alias (__novmx__libc_siglongjmp, __novmxlongjmp) weak_alias (__novmx__libc_siglongjmp, __novmxsiglongjmp) @@ -84,9 +94,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/novmx-longjmp.c glibc-2.17-c758a68 +compat_symbol (libc, __novmxlongjmp, longjmp, GLIBC_2_0); +compat_symbol (libc, __novmxsiglongjmp, siglongjmp, GLIBC_2_0); #endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)) */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-_setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-_setjmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-_setjmp.S 2014-05-27 23:22:10.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-_setjmp.S 2014-05-27 23:22:12.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S ++++ b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S @@ -32,7 +32,7 @@ /* Build a versioned object for libc. */ @@ -105,9 +114,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-_setjmp.S glibc-2.17 /* __GI__setjmp prototype is needed for ntpl i.e. _setjmp is defined as a libc_hidden_proto & is used in sysdeps/generic/libc-start.c if HAVE_CLEANUP_JMP_BUF is defined */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-setjmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-setjmp.S 2014-05-27 23:22:10.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-setjmp.S 2014-05-27 23:22:12.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/bsd-setjmp.S ++++ b/sysdeps/powerpc/powerpc32/bsd-setjmp.S @@ -27,7 +27,7 @@ b __novmx__sigsetjmp@local END (__novmxsetjmp) @@ -123,9 +131,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-setjmp.S glibc-2.17- strong_alias (__vmx__setjmp, __setjmp) -default_symbol_version (__vmxsetjmp,setjmp,GLIBC_2.3.4) +versioned_symbol (libc, __vmxsetjmp, setjmp, GLIBC_2_3_4) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp.S 2014-05-27 23:22:10.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp.S 2014-05-27 23:22:12.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S ++++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S @@ -26,14 +26,14 @@ #else /* !NOT_IN_libc */ @@ -143,9 +150,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp.S glibc-2. # undef __longjmp # define __longjmp __novmx__longjmp # include "__longjmp-common.S" -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp.S 2014-05-27 23:22:10.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp.S 2014-05-27 23:22:12.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/fpu/setjmp.S ++++ b/sysdeps/powerpc/powerpc32/fpu/setjmp.S @@ -26,7 +26,7 @@ #else /* !NOT_IN_libc */ @@ -164,9 +170,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp.S glibc-2.17- # define __sigsetjmp __novmx__sigsetjmp # define __sigjmp_save __novmx__sigjmp_save # include "setjmp-common.S" -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/mcount.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/mcount.c ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/mcount.c 2014-05-27 23:22:10.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/mcount.c 2014-05-27 23:22:12.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/mcount.c ++++ b/sysdeps/powerpc/powerpc32/mcount.c @@ -9,7 +9,7 @@ /* __mcount_internal was added in glibc 2.15 with version GLIBC_PRIVATE, but it should have been put in version GLIBC_2.15. Mark the @@ -176,9 +181,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/mcount.c glibc-2.17-c758 #if SHLIB_COMPAT (libc, GLIBC_2_15, GLIBC_2_16) strong_alias (___mcount_internal, ___mcount_internal_private); -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp.S 2014-05-27 23:22:10.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp.S 2014-05-27 23:22:12.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/setjmp.S ++++ b/sysdeps/powerpc/powerpc32/setjmp.S @@ -25,7 +25,7 @@ #else /* !NOT_IN_libc */ @@ -197,9 +201,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp.S glibc-2.17-c758 # define __sigsetjmp __novmx__sigsetjmp # define __sigjmp_save __novmx__sigjmp_save # include "setjmp-common.S" -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp.S 2014-05-27 23:22:10.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp.S 2014-05-27 23:22:12.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/setjmp.S ++++ b/sysdeps/powerpc/powerpc64/setjmp.S @@ -26,9 +26,9 @@ #else /* !NOT_IN_libc */ diff --git a/packages/glibc/2.17/0045-glibc-ppc64le-23.patch b/packages/glibc/2.17/0045-glibc-ppc64le-23.patch index 00288b9..aa2fd93 100644 --- a/packages/glibc/2.17/0045-glibc-ppc64le-23.patch +++ b/packages/glibc/2.17/0045-glibc-ppc64le-23.patch @@ -12,9 +12,14 @@ # * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S: Ditto. # * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S: Ditto. # -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S 2014-05-27 23:25:35.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S 2014-05-27 23:25:38.000000000 -0500 +--- +# sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S | 8 ++--- +# sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S | 8 ++--- +# sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S | 16 +++++----- +# 3 files changed, 16 insertions(+), 16 deletions(-) +# +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext-common.S @@ -151,15 +151,15 @@ # ifdef SHARED lwz r7,_rtld_global_ro@got(r7) @@ -35,9 +40,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/getconte # endif andis. r7,r7,(PPC_FEATURE_HAS_ALTIVEC >> 16) -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S 2014-05-27 23:25:35.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S 2014-05-27 23:25:38.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext-common.S @@ -79,15 +79,15 @@ # ifdef SHARED lwz r7,_rtld_global_ro@got(r7) @@ -58,9 +62,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/setconte #endif #ifdef __CONTEXT_ENABLE_FPRS -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S 2014-05-27 23:25:35.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S 2014-05-27 23:25:38.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S @@ -152,15 +152,15 @@ # ifdef SHARED lwz r7,_rtld_global_ro@got(r7) diff --git a/packages/glibc/2.17/0046-glibc-ppc64le-24.patch b/packages/glibc/2.17/0046-glibc-ppc64le-24.patch index 5870d4f..ee0b7d8 100644 --- a/packages/glibc/2.17/0046-glibc-ppc64le-24.patch +++ b/packages/glibc/2.17/0046-glibc-ppc64le-24.patch @@ -12,9 +12,13 @@ # conditional form of branch and link when obtaining pc. # * sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S 2014-05-28 12:25:49.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S 2014-05-28 12:25:51.000000000 -0500 +--- +# sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S | 8 ++++++-- +# sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S | 6 ++++-- +# 2 files changed, 10 insertions(+), 4 deletions(-) +# +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S @@ -47,7 +47,9 @@ #ifdef PIC mflr r0 @@ -37,9 +41,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecont 1: mflr r6 addi r6,r6,L(novec_exitcode)-1b mtlr r0 -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S 2014-05-28 12:25:49.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S 2014-05-28 12:25:51.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S @@ -124,8 +124,10 @@ /* If the target function returns we need to do some cleanup. We use a diff --git a/packages/glibc/2.17/0047-glibc-ppc64le-25.patch b/packages/glibc/2.17/0047-glibc-ppc64le-25.patch index 144d3f3..c7d741a 100644 --- a/packages/glibc/2.17/0047-glibc-ppc64le-25.patch +++ b/packages/glibc/2.17/0047-glibc-ppc64le-25.patch @@ -30,9 +30,15 @@ # Rearrange tmp reg use to suit. Comment. # * sysdeps/powerpc/powerpc32/strlen.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strlen.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strlen.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strlen.S 2014-05-28 12:28:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strlen.S 2014-05-28 12:28:45.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/power7/strlen.S | 17 ++++-- +# sysdeps/powerpc/powerpc32/strlen.S | 69 ++++++++++++++++++++------ +# sysdeps/powerpc/powerpc64/power7/strlen.S | 17 ++++-- +# sysdeps/powerpc/powerpc64/strlen.S | 77 +++++++++++++++++++++--------- +# 4 files changed, 132 insertions(+), 48 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/power7/strlen.S ++++ b/sysdeps/powerpc/powerpc32/power7/strlen.S @@ -31,7 +31,11 @@ li r0,0 /* Word with null chars to use with cmpb. */ li r5,-1 /* MASK = 0xffffffffffffffff. */ @@ -73,9 +79,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strlen.S glibc-2. add r3,r5,r0 /* Compute final length. */ blr END (BP_SYM (strlen)) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strlen.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strlen.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strlen.S 2014-05-28 12:28:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strlen.S 2014-05-28 12:32:24.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/strlen.S ++++ b/sysdeps/powerpc/powerpc32/strlen.S @@ -31,7 +31,12 @@ 1 is subtracted you get a value in the range 0x00-0x7f, none of which have their high bit set. The expression here is @@ -212,9 +217,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strlen.S glibc-2.17-c758 + END (BP_SYM (strlen)) libc_hidden_builtin_def (strlen) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strlen.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strlen.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strlen.S 2014-05-28 12:28:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strlen.S 2014-05-28 12:28:45.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/strlen.S ++++ b/sysdeps/powerpc/powerpc64/power7/strlen.S @@ -32,7 +32,11 @@ with cmpb. */ li r5,-1 /* MASK = 0xffffffffffffffff. */ @@ -255,9 +259,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strlen.S glibc-2. add r3,r5,r0 /* Compute final length. */ blr END (BP_SYM (strlen)) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strlen.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strlen.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strlen.S 2014-05-28 12:28:44.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strlen.S 2014-05-28 12:38:17.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/strlen.S ++++ b/sysdeps/powerpc/powerpc64/strlen.S @@ -31,7 +31,12 @@ 1 is subtracted you get a value in the range 0x00-0x7f, none of which have their high bit set. The expression here is diff --git a/packages/glibc/2.17/0048-glibc-ppc64le-26.patch b/packages/glibc/2.17/0048-glibc-ppc64le-26.patch index 93fd255..7b10bfb 100644 --- a/packages/glibc/2.17/0048-glibc-ppc64le-26.patch +++ b/packages/glibc/2.17/0048-glibc-ppc64le-26.patch @@ -17,9 +17,13 @@ # Delete "zero" tail, use "end_max" instead. # * sysdeps/powerpc/powerpc32/power7/strnlen.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strnlen.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strnlen.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strnlen.S 2014-05-28 12:40:17.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strnlen.S 2014-05-28 12:44:52.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/power7/strnlen.S | 106 ++++++++++++++------------- +# sysdeps/powerpc/powerpc64/power7/strnlen.S | 111 +++++++++++++++-------------- +# 2 files changed, 115 insertions(+), 102 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/power7/strnlen.S ++++ b/sysdeps/powerpc/powerpc32/power7/strnlen.S @@ -30,51 +30,47 @@ add r7,r3,r4 /* Calculate the last acceptable address. */ cmplwi r4,16 @@ -194,9 +198,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strnlen.S glibc-2 END (BP_SYM (__strnlen)) weak_alias (BP_SYM (__strnlen), BP_SYM(strnlen)) libc_hidden_builtin_def (strnlen) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strnlen.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strnlen.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strnlen.S 2014-05-28 12:40:17.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strnlen.S 2014-05-28 13:24:41.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/strnlen.S ++++ b/sysdeps/powerpc/powerpc64/power7/strnlen.S @@ -26,33 +26,29 @@ ENTRY (BP_SYM (__strnlen)) CALL_MCOUNT 2 diff --git a/packages/glibc/2.17/0049-glibc-ppc64le-27.patch b/packages/glibc/2.17/0049-glibc-ppc64le-27.patch index 83ca794..188cdf2 100644 --- a/packages/glibc/2.17/0049-glibc-ppc64le-27.patch +++ b/packages/glibc/2.17/0049-glibc-ppc64le-27.patch @@ -23,9 +23,19 @@ # * sysdeps/powerpc/powerpc64/power7/strncmp.S: Likewise. # * sysdeps/powerpc/powerpc32/power7/strncmp.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/strncmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/strncmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/strncmp.S 2014-05-28 13:26:59.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/strncmp.S 2014-05-28 13:27:02.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/power4/strncmp.S | 56 ++++++++++++++++++------ +# sysdeps/powerpc/powerpc32/power7/strncmp.S | 55 +++++++++++++++++------- +# sysdeps/powerpc/powerpc32/strcmp.S | 42 +++++++++++++++++- +# sysdeps/powerpc/powerpc32/strncmp.S | 56 ++++++++++++++++++------ +# sysdeps/powerpc/powerpc64/power4/strncmp.S | 63 ++++++++++++++++++++++++---- +# sysdeps/powerpc/powerpc64/power7/strncmp.S | 61 +++++++++++++++++++++++---- +# sysdeps/powerpc/powerpc64/strcmp.S | 65 ++++++++++++++++++++++++----- +# sysdeps/powerpc/powerpc64/strncmp.S | 65 ++++++++++++++++++++++++----- +# 8 files changed, 381 insertions(+), 82 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/power4/strncmp.S ++++ b/sysdeps/powerpc/powerpc32/power4/strncmp.S @@ -26,7 +26,7 @@ EALIGN (BP_SYM(strncmp), 4, 0) @@ -124,9 +134,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/strncmp.S glibc-2 /* Oh well. In this case, we just do a byte-by-byte comparison. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strncmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strncmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strncmp.S 2014-05-28 13:26:59.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strncmp.S 2014-05-28 13:27:02.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/strncmp.S ++++ b/sysdeps/powerpc/powerpc32/power7/strncmp.S @@ -28,7 +28,7 @@ EALIGN (BP_SYM(strncmp),5,0) @@ -225,9 +234,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strncmp.S glibc-2 /* Oh well. In this case, we just do a byte-by-byte comparison. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcmp.S 2014-05-28 13:26:59.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcmp.S 2014-05-28 13:27:02.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/strcmp.S ++++ b/sysdeps/powerpc/powerpc32/strcmp.S @@ -26,7 +26,7 @@ EALIGN (BP_SYM (strcmp), 4, 0) @@ -301,9 +309,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcmp.S glibc-2.17-c758 /* Oh well. In this case, we just do a byte-by-byte comparison. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strncmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strncmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strncmp.S 2014-05-28 13:26:59.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strncmp.S 2014-05-28 13:27:02.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/strncmp.S ++++ b/sysdeps/powerpc/powerpc32/strncmp.S @@ -26,7 +26,7 @@ EALIGN (BP_SYM(strncmp), 4, 0) @@ -402,9 +409,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strncmp.S glibc-2.17-c75 /* Oh well. In this case, we just do a byte-by-byte comparison. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/strncmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/strncmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/strncmp.S 2014-05-28 13:26:59.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/strncmp.S 2014-05-28 13:27:02.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power4/strncmp.S ++++ b/sysdeps/powerpc/powerpc64/power4/strncmp.S @@ -27,7 +27,7 @@ EALIGN (BP_SYM(strncmp), 4, 0) CALL_MCOUNT 3 @@ -516,9 +522,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/strncmp.S glibc-2 /* Oh well. In this case, we just do a byte-by-byte comparison. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strncmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strncmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strncmp.S 2014-05-28 13:26:59.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strncmp.S 2014-05-28 13:27:02.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/strncmp.S ++++ b/sysdeps/powerpc/powerpc64/power7/strncmp.S @@ -29,7 +29,7 @@ EALIGN (BP_SYM(strncmp),5,0) CALL_MCOUNT 3 @@ -628,9 +633,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strncmp.S glibc-2 /* Oh well. In this case, we just do a byte-by-byte comparison. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strcmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strcmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strcmp.S 2014-05-28 13:26:59.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strcmp.S 2014-05-28 13:37:15.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/strcmp.S ++++ b/sysdeps/powerpc/powerpc64/strcmp.S @@ -27,7 +27,7 @@ EALIGN (BP_SYM(strcmp), 4, 0) CALL_MCOUNT 2 @@ -743,9 +747,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strcmp.S glibc-2.17-c758 /* Oh well. In this case, we just do a byte-by-byte comparison. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strncmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strncmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strncmp.S 2014-05-28 13:26:59.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strncmp.S 2014-05-28 13:38:31.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/strncmp.S ++++ b/sysdeps/powerpc/powerpc64/strncmp.S @@ -27,7 +27,7 @@ EALIGN (BP_SYM(strncmp), 4, 0) CALL_MCOUNT 3 diff --git a/packages/glibc/2.17/0050-glibc-ppc64le-28.patch b/packages/glibc/2.17/0050-glibc-ppc64le-28.patch index 05f63e9..e3e23d7 100644 --- a/packages/glibc/2.17/0050-glibc-ppc64le-28.patch +++ b/packages/glibc/2.17/0050-glibc-ppc64le-28.patch @@ -16,9 +16,15 @@ # * sysdeps/powerpc/powerpc64/stpcpy.S: Likewise. # * sysdeps/powerpc/powerpc32/stpcpy.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/stpcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/stpcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/stpcpy.S 2014-05-28 13:40:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/stpcpy.S 2014-05-28 13:40:01.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/stpcpy.S | 18 +++++++++++++++++- +# sysdeps/powerpc/powerpc32/strcpy.S | 18 +++++++++++++++++- +# sysdeps/powerpc/powerpc64/stpcpy.S | 18 +++++++++++++++++- +# sysdeps/powerpc/powerpc64/strcpy.S | 27 +++++++++++++++++++++++++++ +# 4 files changed, 78 insertions(+), 3 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/stpcpy.S ++++ b/sysdeps/powerpc/powerpc32/stpcpy.S @@ -74,7 +74,22 @@ mr rALT, rWORD @@ -51,9 +57,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/stpcpy.S glibc-2.17-c758 /* Oh well. In this case, we just do a byte-by-byte copy. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcpy.S 2014-05-28 13:40:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcpy.S 2014-05-28 13:40:01.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/strcpy.S ++++ b/sysdeps/powerpc/powerpc32/strcpy.S @@ -78,7 +78,22 @@ mr rALT, rWORD @@ -86,9 +91,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strcpy.S glibc-2.17-c758 /* Oh well. In this case, we just do a byte-by-byte copy. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/stpcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/stpcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/stpcpy.S 2014-05-28 13:40:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/stpcpy.S 2014-05-28 13:40:01.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/stpcpy.S ++++ b/sysdeps/powerpc/powerpc64/stpcpy.S @@ -75,7 +75,22 @@ mr rALT, rWORD @@ -121,9 +125,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/stpcpy.S glibc-2.17-c758 /* Oh well. In this case, we just do a byte-by-byte copy. */ .align 4 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strcpy.S 2014-05-28 13:40:01.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strcpy.S 2014-05-28 13:40:01.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/strcpy.S ++++ b/sysdeps/powerpc/powerpc64/strcpy.S @@ -90,6 +90,32 @@ mr rALT, rWORD /* We've hit the end of the string. Do the rest byte-by-byte. */ diff --git a/packages/glibc/2.17/0051-glibc-ppc64le-29.patch b/packages/glibc/2.17/0051-glibc-ppc64le-29.patch index 291155e..f0817e5 100644 --- a/packages/glibc/2.17/0051-glibc-ppc64le-29.patch +++ b/packages/glibc/2.17/0051-glibc-ppc64le-29.patch @@ -30,11 +30,18 @@ # earlier in tail. # * sysdeps/powerpc/powerpc32/strchr.S: Likewise. # -Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchr.S -=================================================================== ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchr.S.orig -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchr.S -@@ -37,8 +37,8 @@ ENTRY (BP_SYM(strchr)) +--- +# sysdeps/powerpc/powerpc32/power7/strchr.S | 51 +++++++++++++----- +# sysdeps/powerpc/powerpc32/power7/strchrnul.S | 27 +++++++-- +# sysdeps/powerpc/powerpc32/strchr.S | 71 ++++++++++++++++++------- +# sysdeps/powerpc/powerpc64/power7/strchr.S | 43 ++++++++++++--- +# sysdeps/powerpc/powerpc64/power7/strchrnul.S | 19 +++++- +# sysdeps/powerpc/powerpc64/strchr.S | 75 +++++++++++++++++++-------- +# 6 files changed, 212 insertions(+), 74 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/power7/strchr.S ++++ b/sysdeps/powerpc/powerpc32/power7/strchr.S +@@ -37,8 +37,8 @@ beq cr7,L(null_match) /* Replicate byte to word. */ @@ -45,7 +52,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchr.S /* Now r4 has a word of c bytes and r0 has a word of null bytes. */ -@@ -48,11 +48,17 @@ ENTRY (BP_SYM(strchr)) +@@ -48,11 +48,17 @@ /* Move the words left and right to discard the bits that are not part of the string and to bring them back as zeros. */ @@ -64,7 +71,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchr.S or r5,r10,r11 /* OR the results to speed things up. */ cmpwi cr7,r5,0 /* If r5 == 0, no c or null bytes have been found. */ -@@ -67,7 +73,7 @@ ENTRY (BP_SYM(strchr)) +@@ -67,7 +73,7 @@ /* Handle WORD2 of pair. */ lwzu r12,4(r8) @@ -73,7 +80,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchr.S cmpb r11,r12,r0 or r5,r10,r11 cmpwi cr7,r5,0 -@@ -102,22 +108,31 @@ L(loop): +@@ -102,22 +108,31 @@ bne cr6,L(done) /* The c/null byte must be in the second word. Adjust the address @@ -112,7 +119,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchr.S add r3,r8,r0 /* Return address of the matching c byte or null in case c was not found. */ blr -@@ -135,10 +150,14 @@ L(null_match): +@@ -135,10 +150,14 @@ cmpb r5,r12,r0 /* Compare each byte against null bytes. */ /* Move the words left and right to discard the bits that are @@ -129,7 +136,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchr.S cmpwi cr7,r5,0 /* If r10 == 0, no c or null bytes have been found. */ bne cr7,L(done_null) -@@ -193,7 +212,13 @@ L(loop_null): +@@ -193,7 +212,13 @@ 0xff in the same position as the null byte in the original word from the string. Use that to calculate the pointer. */ L(done_null): @@ -143,11 +150,9 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchr.S srwi r0,r0,3 /* Convert leading zeros to bytes. */ add r3,r8,r0 /* Return address of the matching null byte. */ blr -Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchrnul.S -=================================================================== ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchrnul.S.orig -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchrnul.S -@@ -29,8 +29,8 @@ ENTRY (BP_SYM(__strchrnul)) +--- a/sysdeps/powerpc/powerpc32/power7/strchrnul.S ++++ b/sysdeps/powerpc/powerpc32/power7/strchrnul.S +@@ -29,8 +29,8 @@ clrrwi r8,r3,2 /* Align the address to word boundary. */ /* Replicate byte to word. */ @@ -158,7 +163,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchrnul.S rlwinm r6,r3,3,27,28 /* Calculate padding. */ lwz r12,0(r8) /* Load word from memory. */ -@@ -45,10 +45,17 @@ ENTRY (BP_SYM(__strchrnul)) +@@ -45,10 +45,17 @@ /* Move the words left and right to discard the bits that are not part of the string and bring them back as zeros. */ @@ -176,7 +181,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchrnul.S or r5,r9,r10 /* OR the results to speed things up. */ cmpwi cr7,r5,0 /* If r5 == 0, no c or null bytes have been found. */ -@@ -56,7 +63,7 @@ ENTRY (BP_SYM(__strchrnul)) +@@ -56,7 +63,7 @@ mtcrf 0x01,r8 @@ -185,7 +190,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchrnul.S the main loop. Otherwise, go through the alignment code. */ bt 29,L(loop) -@@ -78,7 +85,7 @@ L(loop): +@@ -78,7 +85,7 @@ single register for speed. This is an attempt to speed up the null-checking process for bigger strings. */ lwz r12,4(r8) @@ -194,7 +199,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchrnul.S cmpb r10,r12,r0 cmpb r9,r12,r4 cmpb r6,r11,r0 -@@ -97,9 +104,9 @@ L(loop): +@@ -97,9 +104,9 @@ addi r8,r8,-4 bne cr6,L(done) @@ -207,7 +212,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchrnul.S mr r5,r10 addi r8,r8,4 -@@ -107,7 +114,13 @@ L(loop): +@@ -107,7 +114,13 @@ 0xff in the same position as the c/null byte in the original word from the string. Use that to calculate the pointer. */ L(done): @@ -221,11 +226,9 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/strchrnul.S srwi r0,r0,3 /* Convert leading zeros to bytes. */ add r3,r8,r0 /* Return address of matching c/null byte. */ blr -Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strchr.S -=================================================================== ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strchr.S.orig -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strchr.S -@@ -44,6 +44,8 @@ ENTRY (BP_SYM (strchr)) +--- a/sysdeps/powerpc/powerpc32/strchr.S ++++ b/sysdeps/powerpc/powerpc32/strchr.S +@@ -44,6 +44,8 @@ #define rIGN r10 /* number of bits we should ignore in the first word */ #define rMASK r11 /* mask with the bits to ignore set to 0 */ #define rTMP3 r12 @@ -234,7 +237,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strchr.S CHECK_BOUNDS_LOW (rSTR, rTMP1, rTMP2) STORE_RETURN_BOUNDS (rTMP1, rTMP2) -@@ -59,53 +61,74 @@ ENTRY (BP_SYM (strchr)) +@@ -59,53 +61,74 @@ addi r7F7F, r7F7F, 0x7f7f /* Test the first (partial?) word. */ lwz rWORD, 0(rSTR) @@ -327,7 +330,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strchr.S srwi rCLZB, rCLZB, 3 add rRTN, rSTR, rCLZB CHECK_BOUNDS_HIGH_RTN (rSTR, rTMP2, twlge) -@@ -113,13 +136,21 @@ L(missed): +@@ -113,13 +136,21 @@ blr L(foundit): @@ -351,11 +354,9 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/strchr.S add rRTN, rSTR, rCLZB CHECK_BOUNDS_HIGH_RTN (rSTR, rTMP2, twlge) STORE_RETURN_VALUE (rSTR) -Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchr.S -=================================================================== ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchr.S.orig -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchr.S -@@ -37,8 +37,8 @@ ENTRY (BP_SYM(strchr)) +--- a/sysdeps/powerpc/powerpc64/power7/strchr.S ++++ b/sysdeps/powerpc/powerpc64/power7/strchr.S +@@ -37,8 +37,8 @@ beq cr7,L(null_match) /* Replicate byte to doubleword. */ @@ -366,7 +367,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchr.S insrdi r4,r4,32,0 /* Now r4 has a doubleword of c bytes and r0 has -@@ -49,11 +49,17 @@ ENTRY (BP_SYM(strchr)) +@@ -49,11 +49,17 @@ /* Move the doublewords left and right to discard the bits that are not part of the string and bring them back as zeros. */ @@ -385,7 +386,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchr.S or r5,r10,r11 /* OR the results to speed things up. */ cmpdi cr7,r5,0 /* If r5 == 0, no c or null bytes have been found. */ -@@ -110,15 +116,24 @@ L(loop): +@@ -110,15 +116,24 @@ mr r11,r7 addi r8,r8,8 @@ -415,7 +416,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchr.S add r3,r8,r0 /* Return address of the matching c byte or null in case c was not found. */ blr -@@ -137,9 +152,13 @@ L(null_match): +@@ -137,9 +152,13 @@ /* Move the doublewords left and right to discard the bits that are not part of the string and bring them back as zeros. */ @@ -430,7 +431,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchr.S cmpdi cr7,r5,0 /* If r10 == 0, no c or null bytes have been found. */ bne cr7,L(done_null) -@@ -194,7 +213,13 @@ L(loop_null): +@@ -194,7 +213,13 @@ 0xff in the same position as the null byte in the original doubleword from the string. Use that to calculate the pointer. */ L(done_null): @@ -444,11 +445,9 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchr.S srdi r0,r0,3 /* Convert leading zeros to bytes. */ add r3,r8,r0 /* Return address of the matching null byte. */ blr -Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchrnul.S -=================================================================== ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchrnul.S.orig -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchrnul.S -@@ -29,8 +29,8 @@ ENTRY (BP_SYM(__strchrnul)) +--- a/sysdeps/powerpc/powerpc64/power7/strchrnul.S ++++ b/sysdeps/powerpc/powerpc64/power7/strchrnul.S +@@ -29,8 +29,8 @@ clrrdi r8,r3,3 /* Align the address to doubleword boundary. */ /* Replicate byte to doubleword. */ @@ -459,7 +458,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchrnul.S insrdi r4,r4,32,0 rlwinm r6,r3,3,26,28 /* Calculate padding. */ -@@ -46,10 +46,17 @@ ENTRY (BP_SYM(__strchrnul)) +@@ -46,10 +46,17 @@ /* Move the doublewords left and right to discard the bits that are not part of the string and to bring them back as zeros. */ @@ -477,7 +476,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchrnul.S or r5,r9,r10 /* OR the results to speed things up. */ cmpdi cr7,r5,0 /* If r5 == 0, no c or null bytes have been found. */ -@@ -99,7 +106,7 @@ L(loop): +@@ -99,7 +106,7 @@ bne cr6,L(done) /* The c/null byte must be in the second doubleword. Adjust the @@ -486,7 +485,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchrnul.S the pointer. */ mr r5,r10 addi r8,r8,8 -@@ -108,7 +115,13 @@ L(loop): +@@ -108,7 +115,13 @@ 0xff in the same position as the c/null byte in the original doubleword from the string. Use that to calculate the pointer. */ L(done): @@ -500,11 +499,9 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/strchrnul.S srdi r0,r0,3 /* Convert leading zeros to bytes. */ add r3,r8,r0 /* Return address of matching c/null byte. */ blr -Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strchr.S -=================================================================== ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strchr.S.orig -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strchr.S -@@ -50,14 +50,16 @@ ENTRY (BP_SYM (strchr)) +--- a/sysdeps/powerpc/powerpc64/strchr.S ++++ b/sysdeps/powerpc/powerpc64/strchr.S +@@ -50,14 +50,16 @@ #define rIGN r10 /* number of bits we should ignore in the first word */ #define rMASK r11 /* mask with the bits to ignore set to 0 */ #define rTMP3 r12 @@ -523,7 +520,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strchr.S rlwinm rIGN, rRTN, 3, 26, 28 insrdi rCHR, rCHR, 32, 0 lis rFEFE, -0x101 -@@ -70,53 +72,74 @@ ENTRY (BP_SYM (strchr)) +@@ -70,53 +72,74 @@ add rFEFE, rFEFE, rTMP1 /* Test the first (partial?) word. */ ld rWORD, 0(rSTR) @@ -616,7 +613,7 @@ Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/strchr.S srdi rCLZB, rCLZB, 3 add rRTN, rSTR, rCLZB CHECK_BOUNDS_HIGH_RTN (rSTR, rTMP2, tdlge) -@@ -124,13 +147,21 @@ L(missed): +@@ -124,13 +147,21 @@ blr L(foundit): diff --git a/packages/glibc/2.17/0052-glibc-ppc64le-30.patch b/packages/glibc/2.17/0052-glibc-ppc64le-30.patch index 3834dcc..0b8f04a 100644 --- a/packages/glibc/2.17/0052-glibc-ppc64le-30.patch +++ b/packages/glibc/2.17/0052-glibc-ppc64le-30.patch @@ -34,9 +34,15 @@ # addi 1,1,64 to pop stack frame. Simplify return value code. # * sysdeps/powerpc/powerpc32/power4/memcmp.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcmp.S 2014-05-28 19:22:37.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcmp.S 2014-05-28 23:55:52.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/power4/memcmp.S | 1070 +++++++++++++------ +# sysdeps/powerpc/powerpc32/power7/memcmp.S | 1624 ++++++++++++++++++----------- +# sysdeps/powerpc/powerpc64/power4/memcmp.S | 1156 ++++++++++++++------- +# sysdeps/powerpc/powerpc64/power7/memcmp.S | 1648 ++++++++++++++++++------------ +# 4 files changed, 3523 insertions(+), 1975 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/power4/memcmp.S ++++ b/sysdeps/powerpc/powerpc32/power4/memcmp.S @@ -1,4 +1,4 @@ -/* Optimized strcmp implementation for PowerPC64. +/* Optimized strcmp implementation for PowerPC32. @@ -1700,9 +1706,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcmp.S glibc-2. blr END (BP_SYM (memcmp)) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcmp.S 2014-05-28 19:22:37.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcmp.S 2014-05-28 21:44:57.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/memcmp.S ++++ b/sysdeps/powerpc/powerpc32/power7/memcmp.S @@ -25,10 +25,9 @@ size_t size [r5]) */ @@ -3663,9 +3668,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcmp.S glibc-2. + libc_hidden_builtin_def (memcmp) weak_alias (memcmp,bcmp) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcmp.S 2014-05-28 19:22:37.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcmp.S 2014-05-29 09:35:25.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power4/memcmp.S ++++ b/sysdeps/powerpc/powerpc64/power4/memcmp.S @@ -1,5 +1,5 @@ -/* Optimized strcmp implementation for PowerPC64. - Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc. @@ -5395,9 +5399,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcmp.S glibc-2. +END (memcmp) libc_hidden_builtin_def (memcmp) weak_alias (memcmp, bcmp) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memcmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memcmp.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memcmp.S 2014-05-28 19:22:37.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memcmp.S 2014-05-29 09:35:08.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/memcmp.S ++++ b/sysdeps/powerpc/powerpc64/power7/memcmp.S @@ -1,5 +1,5 @@ /* Optimized memcmp implementation for POWER7/PowerPC64. - Copyright (C) 2010, 2011 Free Software Foundation, Inc. diff --git a/packages/glibc/2.17/0053-glibc-ppc64le-31.patch b/packages/glibc/2.17/0053-glibc-ppc64le-31.patch index de90661..8f8fa74 100644 --- a/packages/glibc/2.17/0053-glibc-ppc64le-31.patch +++ b/packages/glibc/2.17/0053-glibc-ppc64le-31.patch @@ -21,9 +21,20 @@ # * sysdeps/powerpc/powerpc64/power7/mempcpy.S: Likewise. Make better # use of regs. Use power7 mtocrf. Tidy function tails. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcpy.S 2014-05-29 13:04:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcpy.S 2014-05-29 13:04:56.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/power4/memcpy.S | 58 ++ +# sysdeps/powerpc/powerpc32/power6/memcpy.S | 81 +++ +# sysdeps/powerpc/powerpc32/power7/memcpy.S | 24 +# sysdeps/powerpc/powerpc32/power7/mempcpy.S | 28 - +# sysdeps/powerpc/powerpc64/memcpy.S | 27 + +# sysdeps/powerpc/powerpc64/power4/memcpy.S | 157 ++++-- +# sysdeps/powerpc/powerpc64/power6/memcpy.S | 451 +++++++++++++++--- +# sysdeps/powerpc/powerpc64/power7/memcpy.S | 706 +++++++++++++---------------- +# sysdeps/powerpc/powerpc64/power7/mempcpy.S | 26 - +# 9 files changed, 1035 insertions(+), 523 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/power4/memcpy.S ++++ b/sysdeps/powerpc/powerpc32/power4/memcpy.S @@ -205,15 +205,28 @@ blt cr6,5f srwi 7,6,16 @@ -163,9 +174,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memcpy.S glibc-2. or 0,0,8 stw 0,0(4) 3: -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memcpy.S 2014-05-29 13:04:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memcpy.S 2014-05-29 13:04:56.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power6/memcpy.S ++++ b/sysdeps/powerpc/powerpc32/power6/memcpy.S @@ -221,15 +221,28 @@ blt cr6,5f srwi 7,6,16 @@ -385,9 +395,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memcpy.S glibc-2. b L(wdu_32tailx) .align 4 L(wdu_32tailx): -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcpy.S 2014-05-29 13:04:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcpy.S 2014-05-29 13:04:56.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/memcpy.S ++++ b/sysdeps/powerpc/powerpc32/power7/memcpy.S @@ -385,7 +385,7 @@ beq L(copy_GE_32_unaligned_cont) @@ -441,9 +450,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memcpy.S glibc-2. addi 11,11,32 stvx 6,0,10 stvx 10,10,6 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/mempcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/mempcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/mempcpy.S 2014-05-29 13:04:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/mempcpy.S 2014-05-29 13:04:56.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/mempcpy.S ++++ b/sysdeps/powerpc/powerpc32/power7/mempcpy.S @@ -327,7 +327,7 @@ beq L(copy_GE_32_unaligned_cont) @@ -499,9 +507,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/mempcpy.S glibc-2 addi 11,11,32 stvx 6,0,10 stvx 10,10,6 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memcpy.S 2014-05-29 13:04:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memcpy.S 2014-05-29 13:04:56.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/memcpy.S ++++ b/sysdeps/powerpc/powerpc64/memcpy.S @@ -214,15 +214,28 @@ blt cr6,5f srdi 7,6,16 @@ -569,9 +576,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memcpy.S glibc-2.17-c758 or 0,0,8 beq 8f ld 7,16(5) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcpy.S 2014-05-29 13:04:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcpy.S 2014-05-29 13:05:51.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power4/memcpy.S ++++ b/sysdeps/powerpc/powerpc64/power4/memcpy.S @@ -1,5 +1,5 @@ /* Optimized memcpy implementation for PowerPC64. - Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc. @@ -954,9 +960,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memcpy.S glibc-2. -END_GEN_TB (BP_SYM (memcpy),TB_TOCLESS) +END_GEN_TB (memcpy,TB_TOCLESS) libc_hidden_builtin_def (memcpy) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memcpy.S 2014-05-29 13:04:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memcpy.S 2014-05-29 13:05:27.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power6/memcpy.S ++++ b/sysdeps/powerpc/powerpc64/power6/memcpy.S @@ -1,5 +1,5 @@ /* Optimized memcpy implementation for PowerPC64. - Copyright (C) 2003, 2006, 2007, 2011 Free Software Foundation, Inc. @@ -2073,9 +2078,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memcpy.S glibc-2. -END_GEN_TB (BP_SYM (memcpy),TB_TOCLESS) +END_GEN_TB (memcpy,TB_TOCLESS) libc_hidden_builtin_def (memcpy) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memcpy.S 2014-05-29 13:04:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memcpy.S 2014-05-29 13:05:40.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/memcpy.S ++++ b/sysdeps/powerpc/powerpc64/power7/memcpy.S @@ -1,5 +1,5 @@ /* Optimized memcpy implementation for PowerPC64/POWER7. - Copyright (C) 2010, 2011 Free Software Foundation, Inc. @@ -2892,9 +2896,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memcpy.S glibc-2. -END_GEN_TB (BP_SYM (memcpy),TB_TOCLESS) +END_GEN_TB (memcpy,TB_TOCLESS) libc_hidden_builtin_def (memcpy) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/mempcpy.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/mempcpy.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/mempcpy.S 2014-05-29 13:04:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/mempcpy.S 2014-05-29 13:04:56.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/mempcpy.S ++++ b/sysdeps/powerpc/powerpc64/power7/mempcpy.S @@ -367,13 +367,21 @@ mr 11,12 mtcrf 0x01,9 diff --git a/packages/glibc/2.17/0054-glibc-ppc64le-32.patch b/packages/glibc/2.17/0054-glibc-ppc64le-32.patch index 058d53a..808741e 100644 --- a/packages/glibc/2.17/0054-glibc-ppc64le-32.patch +++ b/packages/glibc/2.17/0054-glibc-ppc64le-32.patch @@ -18,9 +18,18 @@ # * sysdeps/powerpc/powerpc32/power6/memset.S: Likewise. # * sysdeps/powerpc/powerpc32/power7/memset.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memset.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memset.S 2014-05-29 13:07:41.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memset.S 2014-05-29 13:07:46.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/power4/memset.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power6/memset.S | 4 ++-- +# sysdeps/powerpc/powerpc32/power7/memset.S | 4 ++-- +# sysdeps/powerpc/powerpc64/memset.S | 10 +++++----- +# sysdeps/powerpc/powerpc64/power4/memset.S | 30 +++++++++++++++--------------- +# sysdeps/powerpc/powerpc64/power6/memset.S | 10 +++++----- +# sysdeps/powerpc/powerpc64/power7/memset.S | 6 +++--- +# 7 files changed, 34 insertions(+), 34 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/power4/memset.S ++++ b/sysdeps/powerpc/powerpc32/power4/memset.S @@ -52,7 +52,7 @@ /* Align to word boundary. */ @@ -39,9 +48,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/memset.S glibc-2. ble cr5, L(medium) /* Align to 32-byte boundary. */ andi. rALIGN, rMEMP, 0x1C -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memset.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memset.S 2014-05-29 13:07:41.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memset.S 2014-05-29 13:07:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power6/memset.S ++++ b/sysdeps/powerpc/powerpc32/power6/memset.S @@ -50,7 +50,7 @@ ble- cr1, L(small) /* Align to word boundary. */ @@ -60,9 +68,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power6/memset.S glibc-2. ble cr5, L(medium) /* Align to 32-byte boundary. */ andi. rALIGN, rMEMP, 0x1C -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memset.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memset.S 2014-05-29 13:07:41.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memset.S 2014-05-29 13:07:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/memset.S ++++ b/sysdeps/powerpc/powerpc32/power7/memset.S @@ -37,8 +37,8 @@ cfi_offset(31,-8) @@ -74,9 +81,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memset.S glibc-2. ble cr6,L(small) /* If length <= 8, use short copy code. */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memset.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memset.S 2014-05-29 13:07:41.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memset.S 2014-05-29 13:07:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/memset.S ++++ b/sysdeps/powerpc/powerpc64/memset.S @@ -73,14 +73,14 @@ /* Align to doubleword boundary. */ @@ -120,9 +126,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/memset.S glibc-2.17-c758 cmpldi cr1, rLEN, 16 L(medium_tail2): add rMEMP, rMEMP, rLEN -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memset.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memset.S 2014-05-29 13:07:41.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memset.S 2014-05-29 13:07:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power4/memset.S ++++ b/sysdeps/powerpc/powerpc64/power4/memset.S @@ -68,14 +68,14 @@ /* Align to doubleword boundary. */ @@ -201,9 +206,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power4/memset.S glibc-2. cmpldi cr1, rLEN, 16 L(medium_tail2): add rMEMP, rMEMP, rLEN -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memset.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memset.S 2014-05-29 13:07:41.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memset.S 2014-05-29 13:07:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power6/memset.S ++++ b/sysdeps/powerpc/powerpc64/power6/memset.S @@ -65,14 +65,14 @@ /* Align to doubleword boundary. */ @@ -247,9 +251,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/memset.S glibc-2. cmpldi cr1, rLEN, 16 L(medium_tail2): add rMEMP, rMEMP, rLEN -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memset.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memset.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memset.S 2014-05-29 13:07:41.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memset.S 2014-05-29 13:07:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/memset.S ++++ b/sysdeps/powerpc/powerpc64/power7/memset.S @@ -34,8 +34,8 @@ mr 10,3 diff --git a/packages/glibc/2.17/0055-glibc-ppc64le-33.patch b/packages/glibc/2.17/0055-glibc-ppc64le-33.patch index 9da11df..bba83ad 100644 --- a/packages/glibc/2.17/0055-glibc-ppc64le-33.patch +++ b/packages/glibc/2.17/0055-glibc-ppc64le-33.patch @@ -48,9 +48,17 @@ # support. Avoid rlwimi. # * sysdeps/powerpc/powerpc32/power7/rawmemchr.S: Likewise. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memchr.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memchr.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memchr.S 2014-05-29 13:09:17.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memchr.S 2014-05-29 13:13:37.000000000 -0500 +--- +# sysdeps/powerpc/powerpc32/power7/memchr.S | 195 +++++++++++-------------- +# sysdeps/powerpc/powerpc32/power7/memrchr.S | 197 ++++++++++++++------------ +# sysdeps/powerpc/powerpc32/power7/rawmemchr.S | 17 +- +# sysdeps/powerpc/powerpc64/power7/memchr.S | 204 ++++++++++++--------------- +# sysdeps/powerpc/powerpc64/power7/memrchr.S | 204 ++++++++++++++------------- +# sysdeps/powerpc/powerpc64/power7/rawmemchr.S | 17 +- +# 6 files changed, 424 insertions(+), 410 deletions(-) +# +--- a/sysdeps/powerpc/powerpc32/power7/memchr.S ++++ b/sysdeps/powerpc/powerpc32/power7/memchr.S @@ -1,5 +1,5 @@ /* Optimized memchr implementation for PowerPC32/POWER7 using cmpb insn. - Copyright (C) 2010-2012 Free Software Foundation, Inc. @@ -330,9 +338,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memchr.S glibc-2. +END (__memchr) +weak_alias (__memchr, memchr) libc_hidden_builtin_def (memchr) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memrchr.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memrchr.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memrchr.S 2014-05-29 13:09:17.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memrchr.S 2014-05-29 13:13:47.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/memrchr.S ++++ b/sysdeps/powerpc/powerpc32/power7/memrchr.S @@ -1,5 +1,5 @@ /* Optimized memrchr implementation for PowerPC32/POWER7 using cmpb insn. - Copyright (C) 2010 Free Software Foundation, Inc. @@ -602,9 +609,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/memrchr.S glibc-2 +END (__memrchr) +weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/rawmemchr.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/rawmemchr.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/rawmemchr.S 2014-05-29 13:09:17.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/rawmemchr.S 2014-05-29 13:09:19.000000000 -0500 +--- a/sysdeps/powerpc/powerpc32/power7/rawmemchr.S ++++ b/sysdeps/powerpc/powerpc32/power7/rawmemchr.S @@ -29,16 +29,21 @@ clrrwi r8,r3,2 /* Align the address to word boundary. */ @@ -645,9 +651,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power7/rawmemchr.S glibc add r3,r8,r0 /* Return address of the matching char. */ blr END (BP_SYM (__rawmemchr)) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memchr.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memchr.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memchr.S 2014-05-29 13:09:17.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memchr.S 2014-05-29 13:13:57.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/memchr.S ++++ b/sysdeps/powerpc/powerpc64/power7/memchr.S @@ -1,5 +1,5 @@ /* Optimized memchr implementation for PowerPC64/POWER7 using cmpb insn. - Copyright (C) 2010-2012 Free Software Foundation, Inc. @@ -932,9 +937,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memchr.S glibc-2. +END (__memchr) +weak_alias (__memchr, memchr) libc_hidden_builtin_def (memchr) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memrchr.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memrchr.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memrchr.S 2014-05-29 13:09:17.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memrchr.S 2014-05-29 13:14:06.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/memrchr.S ++++ b/sysdeps/powerpc/powerpc64/power7/memrchr.S @@ -1,5 +1,5 @@ /* Optimized memrchr implementation for PowerPC64/POWER7 using cmpb insn. - Copyright (C) 2010 Free Software Foundation, Inc. @@ -1209,9 +1213,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/memrchr.S glibc-2 +END (__memrchr) +weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/rawmemchr.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/rawmemchr.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/rawmemchr.S 2014-05-29 13:09:17.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power7/rawmemchr.S 2014-05-29 13:09:19.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/power7/rawmemchr.S ++++ b/sysdeps/powerpc/powerpc64/power7/rawmemchr.S @@ -29,8 +29,8 @@ clrrdi r8,r3,3 /* Align the address to doubleword boundary. */ diff --git a/packages/glibc/2.17/0056-glibc-ppc64le-34.patch b/packages/glibc/2.17/0056-glibc-ppc64le-34.patch index ef6362d..7ad1853 100644 --- a/packages/glibc/2.17/0056-glibc-ppc64le-34.patch +++ b/packages/glibc/2.17/0056-glibc-ppc64le-34.patch @@ -18,10 +18,16 @@ # # PowerPC: Change powerpc64le start ABI to 2.17. # -diff -urN glibc-2.17-c758a686/configure glibc-2.17-c758a686/configure ---- glibc-2.17-c758a686/configure 2014-05-26 19:52:31.000000000 -0500 -+++ glibc-2.17-c758a686/configure 2014-05-26 19:54:13.000000000 -0500 -@@ -4195,8 +4195,8 @@ +--- +# configure | 4 ++-- +# configure.in | 4 ++-- +# nptl/shlib-versions | 1 + +# shlib-versions | 1 + +# 4 files changed, 6 insertions(+), 4 deletions(-) +# +--- a/configure ++++ b/configure +@@ -4176,8 +4176,8 @@ # base_machine, we don't change it. test -n "$base_machine" || case "$machine" in i[34567]86) base_machine=i386 machine=i386/$machine ;; @@ -32,10 +38,9 @@ diff -urN glibc-2.17-c758a686/configure glibc-2.17-c758a686/configure s390) base_machine=s390 machine=s390/s390-32 ;; s390x) base_machine=s390 machine=s390/s390-64 ;; sh3*) base_machine=sh machine=sh/sh3 ;; -diff -urN glibc-2.17-c758a686/configure.in glibc-2.17-c758a686/configure.in ---- glibc-2.17-c758a686/configure.in 2014-05-26 19:52:30.000000000 -0500 -+++ glibc-2.17-c758a686/configure.in 2014-05-26 19:54:45.000000000 -0500 -@@ -549,8 +549,8 @@ +--- a/configure.in ++++ b/configure.in +@@ -539,8 +539,8 @@ # base_machine, we don't change it. test -n "$base_machine" || case "$machine" in i[34567]86) base_machine=i386 machine=i386/$machine ;; @@ -46,18 +51,16 @@ diff -urN glibc-2.17-c758a686/configure.in glibc-2.17-c758a686/configure.in s390) base_machine=s390 machine=s390/s390-32 ;; s390x) base_machine=s390 machine=s390/s390-64 ;; sh3*) base_machine=sh machine=sh/sh3 ;; -diff -urN glibc-2.17-c758a686/nptl/shlib-versions glibc-2.17-c758a686/nptl/shlib-versions ---- glibc-2.17-c758a686/nptl/shlib-versions 2014-05-26 19:52:31.000000000 -0500 -+++ glibc-2.17-c758a686/nptl/shlib-versions 2014-05-26 19:53:31.000000000 -0500 +--- a/nptl/shlib-versions ++++ b/nptl/shlib-versions @@ -2,4 +2,5 @@ sh.*-.*-linux.* libpthread=0 GLIBC_2.2 s390x-.*-linux.* libpthread=0 GLIBC_2.2 powerpc64-.*-linux.* libpthread=0 GLIBC_2.3 +powerpc.*le-.*-linux.* libpthread=0 GLIBC_2.17 .*-.*-linux.* libpthread=0 -diff -urN glibc-2.17-c758a686/shlib-versions glibc-2.17-c758a686/shlib-versions ---- glibc-2.17-c758a686/shlib-versions 2014-05-26 19:52:31.000000000 -0500 -+++ glibc-2.17-c758a686/shlib-versions 2014-05-26 19:53:31.000000000 -0500 +--- a/shlib-versions ++++ b/shlib-versions @@ -23,6 +23,7 @@ s390x-.*-linux.* DEFAULT GLIBC_2.2 diff --git a/packages/glibc/2.17/0057-glibc-ppc64le-35.patch b/packages/glibc/2.17/0057-glibc-ppc64le-35.patch index 17434b9..2aa0053 100644 --- a/packages/glibc/2.17/0057-glibc-ppc64le-35.patch +++ b/packages/glibc/2.17/0057-glibc-ppc64le-35.patch @@ -29,9 +29,13 @@ # is already done on other platforms. This fixes the libgo # regression on ELFv2. # -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S 2014-05-29 13:16:16.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S 2014-05-29 13:16:17.000000000 -0500 +--- +# sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S | 9 ++++++++ +# sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S | 18 ++++++++++++++++ +# 2 files changed, 27 insertions(+) +# +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S @@ -129,6 +129,10 @@ the cpu link stack used to predict blr return addresses. */ bcl 20,31,L(gotexitcodeaddr); @@ -55,9 +59,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecont /* The address of the exit code is in the link register. Store the lr in the ucontext as LNK so the target function will return to our exit code. */ -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S 2014-05-29 13:16:16.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S 2014-05-29 13:16:17.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S @@ -129,6 +129,10 @@ lfd fp1,(SIGCONTEXT_FP_REGS+(PT_R1*8))(r31) lfd fp0,(SIGCONTEXT_FP_REGS+(PT_R0*8))(r31) diff --git a/packages/glibc/2.17/0058-glibc-ppc64le-36.patch b/packages/glibc/2.17/0058-glibc-ppc64le-36.patch index fbe351c..b710258 100644 --- a/packages/glibc/2.17/0058-glibc-ppc64le-36.patch +++ b/packages/glibc/2.17/0058-glibc-ppc64le-36.patch @@ -19,10 +19,14 @@ # The patch also fixes a bug in overflow checking for the R_PPC64_ADDR30 # and R_PPC64_ADDR32 relocations. # -diff -urN glibc-2.17-c758a686/elf/elf.h glibc-2.17-c758a686/elf/elf.h ---- glibc-2.17-c758a686/elf/elf.h 2014-05-29 13:17:35.000000000 -0500 -+++ glibc-2.17-c758a686/elf/elf.h 2014-05-29 13:17:35.000000000 -0500 -@@ -2243,6 +2243,17 @@ +--- +# elf/elf.h | 11 +++++++++++ +# sysdeps/powerpc/powerpc64/dl-machine.h | 24 ++++++++++++++++++++++-- +# 2 files changed, 33 insertions(+), 2 deletions(-) +# +--- a/elf/elf.h ++++ b/elf/elf.h +@@ -2240,6 +2240,17 @@ #define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */ #define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */ #define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */ @@ -40,9 +44,8 @@ diff -urN glibc-2.17-c758a686/elf/elf.h glibc-2.17-c758a686/elf/elf.h /* GNU extension to support local ifunc. */ #define R_PPC64_JMP_IREL 247 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 13:17:34.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 13:17:35.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-machine.h ++++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -663,11 +663,25 @@ case R_PPC64_TPREL16_HI: diff --git a/packages/glibc/2.17/0059-glibc-ppc64le-37.patch b/packages/glibc/2.17/0059-glibc-ppc64le-37.patch index dad59a6..84e3ffe 100644 --- a/packages/glibc/2.17/0059-glibc-ppc64le-37.patch +++ b/packages/glibc/2.17/0059-glibc-ppc64le-37.patch @@ -17,9 +17,12 @@ # to avoid changing the ABI; see the recent discussion when adding # the EBB fields. # -diff -urN glibc-2.17-c758a686/nptl/sysdeps/powerpc/tls.h glibc-2.17-c758a686/nptl/sysdeps/powerpc/tls.h ---- glibc-2.17-c758a686/nptl/sysdeps/powerpc/tls.h 2014-05-29 13:19:25.000000000 -0500 -+++ glibc-2.17-c758a686/nptl/sysdeps/powerpc/tls.h 2014-05-29 13:19:25.000000000 -0500 +--- +# nptl/sysdeps/powerpc/tls.h | 2 ++ +# 1 file changed, 2 insertions(+) +# +--- a/nptl/sysdeps/powerpc/tls.h ++++ b/nptl/sysdeps/powerpc/tls.h @@ -61,6 +61,8 @@ are private. */ typedef struct diff --git a/packages/glibc/2.17/0060-glibc-ppc64le-38.patch b/packages/glibc/2.17/0060-glibc-ppc64le-38.patch index 196f0ad..43a4a92 100644 --- a/packages/glibc/2.17/0060-glibc-ppc64le-38.patch +++ b/packages/glibc/2.17/0060-glibc-ppc64le-38.patch @@ -16,9 +16,16 @@ # # No relevant change in generated code expected. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S 2014-05-29 13:56:35.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S 2014-05-29 13:56:37.000000000 -0500 +--- +# sysdeps/powerpc/powerpc64/crti.S | 24 +---------------- +# sysdeps/powerpc/powerpc64/dl-machine.h | 18 ------------ +# sysdeps/powerpc/powerpc64/dl-trampoline.S | 24 ++++------------- +# sysdeps/powerpc/powerpc64/sysdep.h | 31 ++++++++++++++++++++-- +# sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S | 4 -- +# 5 files changed, 39 insertions(+), 62 deletions(-) +# +--- a/sysdeps/powerpc/powerpc64/crti.S ++++ b/sysdeps/powerpc/powerpc64/crti.S @@ -60,18 +60,8 @@ .LC0: .tc PREINIT_FUNCTION[TC], PREINIT_FUNCTION @@ -59,9 +66,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S glibc-2.17-c758a6 .align ALIGNARG (2) BODY_LABEL (_fini): mflr 0 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 13:56:35.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 13:56:37.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-machine.h ++++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -122,14 +122,7 @@ #define RTLD_START \ asm (".pushsection \".text\"\n" \ @@ -109,9 +115,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17- " bctr\n" \ ".LT__dl_start_user:\n" \ " .long 0\n" \ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S 2014-05-29 13:56:35.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S 2014-05-29 13:56:37.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-trampoline.S ++++ b/sysdeps/powerpc/powerpc64/dl-trampoline.S @@ -71,12 +71,8 @@ ld r5,INT_PARMS+16(r1) ld r4,INT_PARMS+8(r1) @@ -160,9 +165,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S glibc-2. /* Load the floating point registers. */ lfd fp1,FPR_PARMS+0(r1) lfd fp2,FPR_PARMS+8(r1) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h 2014-05-29 13:56:35.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h 2014-05-29 13:56:37.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/sysdep.h ++++ b/sysdeps/powerpc/powerpc64/sysdep.h @@ -74,6 +74,14 @@ #endif .endm @@ -246,9 +250,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h glibc-2.17-c758 # define END_2(name) \ ".size " #name ",.-" BODY_PREFIX #name ";\n" \ ".size " BODY_PREFIX #name ",.-" BODY_PREFIX #name ";" -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S 2014-05-29 13:56:35.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S 2014-05-29 13:56:37.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S @@ -104,9 +104,7 @@ std r2,40(r1) diff --git a/packages/glibc/2.17/0061-glibc-ppc64le-39.patch b/packages/glibc/2.17/0061-glibc-ppc64le-39.patch index f837d99..f39f271 100644 --- a/packages/glibc/2.17/0061-glibc-ppc64le-39.patch +++ b/packages/glibc/2.17/0061-glibc-ppc64le-39.patch @@ -33,10 +33,20 @@ # The hack in VDSO_IFUNC_RET to "synthesize" a function descriptor # for vDSO routines is also no longer necessary for ELFv2. # -diff -urN glibc-2.17-c758a686/elf/elf.h glibc-2.17-c758a686/elf/elf.h ---- glibc-2.17-c758a686/elf/elf.h 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/elf/elf.h 2014-05-29 13:58:25.000000000 -0500 -@@ -2263,6 +2263,12 @@ +--- +# elf/elf.h | 6 +# sysdeps/powerpc/powerpc64/crti.S | 2 +# sysdeps/powerpc/powerpc64/dl-irel.h | 4 +# sysdeps/powerpc/powerpc64/dl-machine.h | 99 ++++++++++++---- +# sysdeps/powerpc/powerpc64/setjmp-common.S | 21 +-- +# sysdeps/powerpc/powerpc64/sysdep.h | 54 ++++++++ +# sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h | 4 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S | 7 + +# 8 files changed, 162 insertions(+), 35 deletions(-) +# +--- a/elf/elf.h ++++ b/elf/elf.h +@@ -2260,6 +2260,12 @@ #define R_PPC64_REL16_HI 251 /* half16 (sym+add-.)@h */ #define R_PPC64_REL16_HA 252 /* half16 (sym+add-.)@ha */ @@ -49,9 +59,8 @@ diff -urN glibc-2.17-c758a686/elf/elf.h glibc-2.17-c758a686/elf/elf.h /* PowerPC64 specific values for the Dyn d_tag field. */ #define DT_PPC64_GLINK (DT_LOPROC + 0) #define DT_PPC64_OPD (DT_LOPROC + 1) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/crti.S ++++ b/sysdeps/powerpc/powerpc64/crti.S @@ -64,6 +64,7 @@ ENTRY_2(_init) .align ALIGNARG (2) @@ -68,9 +77,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S glibc-2.17-c758a6 mflr 0 std 0, 16(r1) stdu r1, -112(r1) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-irel.h ++++ b/sysdeps/powerpc/powerpc64/dl-irel.h @@ -50,7 +50,11 @@ { Elf64_Addr *const reloc_addr = (void *) reloc->r_offset; @@ -83,9 +91,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-irel.h glibc-2.17-c75 } else __libc_fatal ("unexpected reloc type in static binary"); -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 14:05:46.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-machine.h ++++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -31,6 +31,7 @@ in l_info array. */ #define DT_PPC64(x) (DT_PPC64_##x - DT_LOPROC + DT_NUM) @@ -311,9 +318,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17- return ((Elf64_Addr (*) (unsigned long int)) value) (GLRO(dl_hwcap)); } -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S 2014-05-29 14:00:27.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/setjmp-common.S ++++ b/sysdeps/powerpc/powerpc64/setjmp-common.S @@ -55,21 +55,22 @@ that saves r2 since the call won't go via a plt call stub. See bugz #269. __GI__setjmp is used in csu/libc-start.c when @@ -366,9 +372,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S glibc-2. #endif -END (BP_SYM (__sigsetjmp)) +END (__sigsetjmp) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h 2014-05-29 13:58:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/sysdep.h ++++ b/sysdeps/powerpc/powerpc64/sysdep.h @@ -74,6 +74,8 @@ #endif .endm @@ -463,9 +468,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h glibc-2.17-c758 +#endif /* _CALL_ELF */ #endif /* __ASSEMBLER__ */ -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h 2014-05-29 13:58:24.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h @@ -23,6 +23,8 @@ /* Now define our stuff. */ @@ -482,9 +486,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs +#endif + #endif /* ldsodefs.h */ -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S 2014-05-29 13:58:24.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S 2014-05-29 13:58:25.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S @@ -111,6 +111,7 @@ L(noparms): diff --git a/packages/glibc/2.17/0062-glibc-ppc64le-40.patch b/packages/glibc/2.17/0062-glibc-ppc64le-40.patch index 663d2f3..87b707d 100644 --- a/packages/glibc/2.17/0062-glibc-ppc64le-40.patch +++ b/packages/glibc/2.17/0062-glibc-ppc64le-40.patch @@ -27,10 +27,15 @@ # the target function for the first time, since it assumed that function # would always reload its own TOC anyway ... # -diff -urN glibc-2.17-c758a686/elf/elf.h glibc-2.17-c758a686/elf/elf.h ---- glibc-2.17-c758a686/elf/elf.h 2014-05-29 14:08:44.000000000 -0500 -+++ glibc-2.17-c758a686/elf/elf.h 2014-05-29 14:08:44.000000000 -0500 -@@ -2273,8 +2273,19 @@ +--- +# elf/elf.h | 11 +++++++ +# sysdeps/powerpc/powerpc64/dl-machine.h | 44 ++++++++++++++++++++++++++++-- +# sysdeps/powerpc/powerpc64/dl-trampoline.S | 8 +++++ +# 3 files changed, 61 insertions(+), 2 deletions(-) +# +--- a/elf/elf.h ++++ b/elf/elf.h +@@ -2270,8 +2270,19 @@ #define DT_PPC64_GLINK (DT_LOPROC + 0) #define DT_PPC64_OPD (DT_LOPROC + 1) #define DT_PPC64_OPDSZ (DT_LOPROC + 2) @@ -50,9 +55,8 @@ diff -urN glibc-2.17-c758a686/elf/elf.h glibc-2.17-c758a686/elf/elf.h /* ARM specific declarations */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 14:08:40.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 14:08:44.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-machine.h ++++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -425,6 +425,42 @@ return lazy; } @@ -132,9 +136,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17- #else elf_machine_fixup_plt (map, sym_map, reloc, reloc_addr, value); #endif -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S 2014-05-29 14:08:40.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S 2014-05-29 14:08:44.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-trampoline.S ++++ b/sysdeps/powerpc/powerpc64/dl-trampoline.S @@ -74,6 +74,10 @@ /* Prepare for calling the function returned by fixup. */ PPC64_LOAD_FUNCPTR r3 diff --git a/packages/glibc/2.17/0063-glibc-ppc64le-41.patch b/packages/glibc/2.17/0063-glibc-ppc64le-41.patch index 506d761..2df36ef 100644 --- a/packages/glibc/2.17/0063-glibc-ppc64le-41.patch +++ b/packages/glibc/2.17/0063-glibc-ppc64le-41.patch @@ -34,9 +34,24 @@ # a stack frame, and the patch changes them to add extra space in # these frames as temporary space for the ELFv2 ABI. # -diff -urN glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h ---- glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h 2014-05-29 14:10:00.000000000 -0500 -+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h 2014-05-29 14:10:00.000000000 -0500 +--- +# nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h | 60 ++++--- +# sysdeps/powerpc/powerpc64/__longjmp-common.S | 4 +# sysdeps/powerpc/powerpc64/crti.S | 8 - +# sysdeps/powerpc/powerpc64/crtn.S | 8 - +# sysdeps/powerpc/powerpc64/dl-trampoline.S | 48 +++--- +# sysdeps/powerpc/powerpc64/ppc-mcount.S | 14 - +# sysdeps/powerpc/powerpc64/setjmp-common.S | 16 +- +# sysdeps/powerpc/powerpc64/sysdep.h | 76 +++++++--- +# sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S | 16 +- +# sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S | 4 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S | 32 ++-- +# sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S | 29 ++- +# sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.sym | 21 -- +# 13 files changed, 186 insertions(+), 150 deletions(-) +# +--- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h ++++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h @@ -31,6 +31,14 @@ # define DASHDASHPFX(str) __##str # endif @@ -131,9 +146,8 @@ diff -urN glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sys # ifdef IS_IN_libpthread # ifdef SHARED -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/__longjmp-common.S ++++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S @@ -133,7 +133,7 @@ ld r14,((JB_GPRS+0)*8)(r3) lfd fp14,((JB_FPRS+0)*8)(r3) @@ -152,9 +166,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S glibc ld r21,((JB_GPRS+7)*8)(r3) lfd fp21,((JB_FPRS+7)*8)(r3) ld r22,((JB_GPRS+8)*8)(r3) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/crti.S ++++ b/sysdeps/powerpc/powerpc64/crti.S @@ -66,8 +66,8 @@ BODY_LABEL (_init): LOCALENTRY(_init) @@ -174,9 +187,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crti.S glibc-2.17-c758a6 - stdu r1, -112(r1) + std 0, FRAME_LR_SAVE(r1) + stdu r1, -FRAME_MIN_SIZE_PARM(r1) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crtn.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crtn.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crtn.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crtn.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/crtn.S ++++ b/sysdeps/powerpc/powerpc64/crtn.S @@ -39,13 +39,13 @@ #include @@ -195,9 +207,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/crtn.S glibc-2.17-c758a6 + ld r0, FRAME_LR_SAVE(r1) mtlr r0 blr -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-trampoline.S ++++ b/sysdeps/powerpc/powerpc64/dl-trampoline.S @@ -26,13 +26,13 @@ parm1 (r3) and the index (r0) need to be converted to an offset (index * 24) in parm2 (r4). */ @@ -363,9 +374,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S glibc-2. ld r31,584(r1) ld r30,576(r1) mtlr r0 -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/ppc-mcount.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/ppc-mcount.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/ppc-mcount.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/ppc-mcount.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/ppc-mcount.S ++++ b/sysdeps/powerpc/powerpc64/ppc-mcount.S @@ -24,16 +24,16 @@ ENTRY(_mcount) mflr r4 @@ -390,9 +400,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/ppc-mcount.S glibc-2.17- blr END(_mcount) -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/setjmp-common.S ++++ b/sysdeps/powerpc/powerpc64/setjmp-common.S @@ -56,7 +56,7 @@ bugz #269. __GI__setjmp is used in csu/libc-start.c when HAVE_CLEANUP_JMP_BUF is defined. */ @@ -432,9 +441,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S glibc-2. mtlr r0 blr #endif -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/sysdep.h ++++ b/sysdeps/powerpc/powerpc64/sysdep.h @@ -20,25 +20,67 @@ #ifdef __ASSEMBLER__ @@ -557,9 +565,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/sysdep.h glibc-2.17-c758 mtlr 0; \ cfi_restore(lr); \ blr; \ -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S @@ -33,24 +33,24 @@ cmpld reg, r1; \ bge+ .Lok; \ @@ -593,9 +600,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/____long add r4,r4,r0; \ sub r3,r3,reg; \ cmpld r3,r0; \ -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S @@ -31,9 +31,9 @@ CALL_MCOUNT 1 DISCARD_BOUNDS (r3) /* the bounds are meaningless, so toss 'em. */ @@ -608,9 +614,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S gl ld r5,.LC__curbrk@toc(r2) std r3,0(r5) cmpld r6,r3 -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S @@ -45,22 +45,22 @@ cror cr0*4+eq,cr1*4+eq,cr0*4+eq beq- cr0,L(badargs) @@ -679,9 +684,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S #ifdef RESET_PID cfi_restore(r29) #endif -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S @@ -46,8 +46,13 @@ # endif #endif @@ -731,9 +735,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S mtlr r4 mtcr r0 addi r1,r1,FRAMESIZE -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.sym glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.sym ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.sym 2014-05-29 14:09:56.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.sym 2014-05-29 14:10:00.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.sym ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.sym @@ -8,27 +8,6 @@ SIG_SETMASK diff --git a/packages/glibc/2.17/0064-glibc-ppc64le-42.patch b/packages/glibc/2.17/0064-glibc-ppc64le-42.patch index f5fa53e..3d3150a 100644 --- a/packages/glibc/2.17/0064-glibc-ppc64le-42.patch +++ b/packages/glibc/2.17/0064-glibc-ppc64le-42.patch @@ -26,9 +26,16 @@ # were stored in the wrong place, and it removes the unnecessary # save/restore of CR. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/bits/link.h glibc-2.17-c758a686/sysdeps/powerpc/bits/link.h ---- glibc-2.17-c758a686/sysdeps/powerpc/bits/link.h 2014-05-29 14:11:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/bits/link.h 2014-05-29 14:11:20.000000000 -0500 +--- +# sysdeps/powerpc/bits/link.h | 46 ++++++++++ +# sysdeps/powerpc/ldsodefs.h | 18 +++- +# sysdeps/powerpc/powerpc64/dl-machine.h | 5 + +# sysdeps/powerpc/powerpc64/dl-trampoline.S | 131 ++++++++++++++++++++---------- +# sysdeps/powerpc/powerpc64/tst-audit.h | 8 + +# 5 files changed, 163 insertions(+), 45 deletions(-) +# +--- a/sysdeps/powerpc/bits/link.h ++++ b/sysdeps/powerpc/bits/link.h @@ -63,7 +63,7 @@ __END_DECLS @@ -87,9 +94,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/bits/link.h glibc-2.17-c758a686/sy +__END_DECLS + #endif -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/ldsodefs.h glibc-2.17-c758a686/sysdeps/powerpc/ldsodefs.h ---- glibc-2.17-c758a686/sysdeps/powerpc/ldsodefs.h 2014-05-29 14:11:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/ldsodefs.h 2014-05-29 14:11:20.000000000 -0500 +--- a/sysdeps/powerpc/ldsodefs.h ++++ b/sysdeps/powerpc/ldsodefs.h @@ -25,6 +25,8 @@ struct La_ppc32_retval; struct La_ppc64_regs; @@ -129,9 +135,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/ldsodefs.h glibc-2.17-c758a686/sys #include_next -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 14:11:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h 2014-05-29 14:11:20.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-machine.h ++++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -546,8 +546,13 @@ @@ -146,9 +151,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-machine.h glibc-2.17- #endif /* dl_machine_h */ -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S 2014-05-29 14:11:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S 2014-05-29 14:11:20.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/dl-trampoline.S ++++ b/sysdeps/powerpc/powerpc64/dl-trampoline.S @@ -50,11 +50,8 @@ /* Store the LR in the LR Save area. */ std r0,FRAME_SIZE+FRAME_LR_SAVE(r1) @@ -382,9 +386,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/dl-trampoline.S glibc-2. mtlr r0 ld r1,0(r1) blr -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/tst-audit.h glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/tst-audit.h ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/tst-audit.h 2014-05-29 14:11:12.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/tst-audit.h 2014-05-29 14:11:20.000000000 -0500 +--- a/sysdeps/powerpc/powerpc64/tst-audit.h ++++ b/sysdeps/powerpc/powerpc64/tst-audit.h @@ -18,8 +18,16 @@ License along with the GNU C Library. If not, see . */ diff --git a/packages/glibc/2.17/0065-glibc-ppc64le-43.patch b/packages/glibc/2.17/0065-glibc-ppc64le-43.patch index 8c43abb..ab73b1c 100644 --- a/packages/glibc/2.17/0065-glibc-ppc64le-43.patch +++ b/packages/glibc/2.17/0065-glibc-ppc64le-43.patch @@ -18,9 +18,16 @@ # check in sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac, # replacing the hard-coded value of default-abi in the Makefile. # -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile 2014-05-29 14:12:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile 2014-05-29 14:12:30.000000000 -0500 +--- +# sysdeps/unix/sysv/linux/powerpc/Makefile | 11 - +# sysdeps/unix/sysv/linux/powerpc/ldconfig.h | 3 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile | 2 +# sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | 166 +++++++++++++++++ +# sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac | 15 + +# 5 files changed, 190 insertions(+), 7 deletions(-) +# +--- a/sysdeps/unix/sysv/linux/powerpc/Makefile ++++ b/sysdeps/unix/sysv/linux/powerpc/Makefile @@ -1,9 +1,12 @@ -abi-variants := 32 64 +abi-variants := 32 64-v1 64-v2 @@ -38,9 +45,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile glibc-2.1 ifeq ($(subdir),rt) librt-routines += rt-sysdep -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/ldconfig.h glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/ldconfig.h ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/ldconfig.h 2014-05-29 14:12:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/ldconfig.h 2014-05-29 14:12:30.000000000 -0500 +--- a/sysdeps/unix/sysv/linux/powerpc/ldconfig.h ++++ b/sysdeps/unix/sysv/linux/powerpc/ldconfig.h @@ -20,7 +20,8 @@ #define SYSDEP_KNOWN_INTERPRETER_NAMES \ @@ -51,15 +57,13 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/ldconfig.h glibc-2 #define SYSDEP_KNOWN_LIBRARY_NAMES \ { "libc.so.6", FLAG_ELF_LIBC6 }, \ { "libm.so.6", FLAG_ELF_LIBC6 }, -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile 2014-05-29 14:12:25.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile 1969-12-31 18:00:00.000000000 -0600 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile ++++ /dev/null @@ -1,2 +0,0 @@ -# See Makeconfig regarding the use of default-abi. -default-abi := 64 -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure 1969-12-31 18:00:00.000000000 -0600 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure 2014-05-29 14:12:30.000000000 -0500 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure @@ -0,0 +1,166 @@ +# This file is generated from configure.ac by Autoconf. DO NOT EDIT! + # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/powerpc64/. @@ -227,9 +231,8 @@ diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/configur + config_vars="$config_vars +default-abi = 64-v1" +fi -diff -urN glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac ---- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac 1969-12-31 18:00:00.000000000 -0600 -+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac 2014-05-29 14:12:30.000000000 -0500 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure.ac @@ -0,0 +1,15 @@ +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +# Local configure fragment for sysdeps/unix/sysv/linux/powerpc/powerpc64/. diff --git a/packages/glibc/2.17/0066-glibc-ppc64le-44.patch b/packages/glibc/2.17/0066-glibc-ppc64le-44.patch index e074cb9..8ae0f5d 100644 --- a/packages/glibc/2.17/0066-glibc-ppc64le-44.patch +++ b/packages/glibc/2.17/0066-glibc-ppc64le-44.patch @@ -7,9 +7,12 @@ # [BZ #16786] # * sysdeps/powerpc/powerpc64/fpu/s_copysign.S: Don't trash stack. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_copysign.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_copysign.S ---- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_copysign.S 2014-05-29 14:13:47.000000000 -0500 -+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/s_copysign.S 2014-05-29 14:13:50.000000000 -0500 +--- +# sysdeps/powerpc/powerpc64/fpu/s_copysign.S | 4 ++-- +# 1 file changed, 2 insertions(+), 2 deletions(-) +# +--- a/sysdeps/powerpc/powerpc64/fpu/s_copysign.S ++++ b/sysdeps/powerpc/powerpc64/fpu/s_copysign.S @@ -27,11 +27,11 @@ /* double [f1] copysign (double [f1] x, double [f2] y); copysign(x,y) returns a value with the magnitude of x and diff --git a/packages/glibc/2.17/0067-glibc-ppc64le-45.patch b/packages/glibc/2.17/0067-glibc-ppc64le-45.patch index 9030fc2..f68f0cb 100644 --- a/packages/glibc/2.17/0067-glibc-ppc64le-45.patch +++ b/packages/glibc/2.17/0067-glibc-ppc64le-45.patch @@ -12,9 +12,12 @@ # # The ABI testing for libpthread.so now passes for ppc64le. # -diff -urN glibc-2.17-c758a686/Versions.def glibc-2.17-c758a686/Versions.def ---- glibc-2.17-c758a686/Versions.def 2014-06-02 21:13:12.000000000 +0000 -+++ glibc-2.17-c758a686/Versions.def 2014-06-02 21:14:38.000000000 +0000 +--- +# Versions.def | 2 ++ +# 1 file changed, 2 insertions(+) +# +--- a/Versions.def ++++ b/Versions.def @@ -92,6 +92,7 @@ GLIBC_2.2 GLIBC_2.2.3 diff --git a/packages/glibc/2.17/0068-glibc-ppc64le-46.patch b/packages/glibc/2.17/0068-glibc-ppc64le-46.patch index 6f3d1d9..8c65c5c 100644 --- a/packages/glibc/2.17/0068-glibc-ppc64le-46.patch +++ b/packages/glibc/2.17/0068-glibc-ppc64le-46.patch @@ -7,9 +7,12 @@ # ppc64le patch that touches the same ULPs file. See glibc-power-libm-test-ulps.patch # for the ppc64/ppc version. # -diff -urN glibc-2.17-c758a686/sysdeps/powerpc/fpu/libm-test-ulps glibc-2.17-c758a686/sysdeps/powerpc/fpu/libm-test-ulps ---- glibc-2.17-c758a686/sysdeps/powerpc/fpu/libm-test-ulps 2014-07-25 22:07:06.280020855 -0400 -+++ glibc-2.17-c758a686/sysdeps/powerpc/fpu/libm-test-ulps 2014-07-25 22:26:54.650021033 -0400 +--- +# sysdeps/powerpc/fpu/libm-test-ulps | 3 +++ +# 1 file changed, 3 insertions(+) +# +--- a/sysdeps/powerpc/fpu/libm-test-ulps ++++ b/sysdeps/powerpc/fpu/libm-test-ulps @@ -2644,6 +2644,9 @@ Test "tan_towardzero (2)": ildouble: 1 diff --git a/packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch b/packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch index 8864739..d99da10 100644 --- a/packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch +++ b/packages/glibc/2.17/0069-uses-power6-mtfsf-when-not-supported.patch @@ -6,11 +6,14 @@ * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S (__novec_swapcontext): Likewise. -diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S -index e47a57a..a1ed419 100644 +--- + sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S | 18 ++++++++++------ + sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S | 18 ++++++++++++---- + 2 files changed, 26 insertions(+), 10 deletions(-) + --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S -@@ -79,12 +79,13 @@ ENTRY(__novec_setcontext) +@@ -80,12 +80,13 @@ lfd fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31) lfd fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31) @@ -26,7 +29,7 @@ index e47a57a..a1ed419 100644 /* Availability of DFP indicates a 64-bit FPSCR. */ andi. r6,r5,PPC_FEATURE_HAS_DFP beq 5f -@@ -95,8 +96,10 @@ ENTRY(__novec_setcontext) +@@ -96,8 +97,10 @@ 5: mtfsf 0xff,fp0 6: @@ -38,7 +41,7 @@ index e47a57a..a1ed419 100644 lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) lfd fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r31) -@@ -362,12 +365,13 @@ L(has_no_vec): +@@ -363,12 +366,13 @@ lfd fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31) lfd fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31) @@ -54,7 +57,7 @@ index e47a57a..a1ed419 100644 /* Availability of DFP indicates a 64-bit FPSCR. */ andi. r6,r5,PPC_FEATURE_HAS_DFP beq 7f -@@ -378,8 +382,10 @@ L(has_no_vec): +@@ -379,8 +383,10 @@ 7: mtfsf 0xff,fp0 8: @@ -66,11 +69,9 @@ index e47a57a..a1ed419 100644 lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) lfd fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r31) -diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S -index bc02a21..b25904d 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S -@@ -173,6 +173,10 @@ ENTRY(__novec_swapcontext) +@@ -174,6 +174,10 @@ lfd fp0,(SIGCONTEXT_FP_REGS+(32*8))(r31) lfd fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31) lfd fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31) @@ -81,7 +82,7 @@ index bc02a21..b25904d 100644 # ifdef _ARCH_PWR6 /* Use the extended four-operand version of the mtfsf insn. */ mtfsf 0xff,fp0,1,0 -@@ -189,8 +193,10 @@ ENTRY(__novec_swapcontext) +@@ -190,8 +194,10 @@ 5: mtfsf 0xff,fp0 6: @@ -93,7 +94,7 @@ index bc02a21..b25904d 100644 lfd fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31) lfd fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31) lfd fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r31) -@@ -652,12 +658,14 @@ L(has_no_vec2): +@@ -653,12 +659,14 @@ lfd fp0,(SIGCONTEXT_FP_REGS+(32*8))(r31) lfd fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31) lfd fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31) @@ -110,7 +111,7 @@ index bc02a21..b25904d 100644 /* Availability of DFP indicates a 64-bit FPSCR. */ andi. r6,r8,PPC_FEATURE_HAS_DFP beq 7f -@@ -668,8 +676,10 @@ L(has_no_vec2): +@@ -669,8 +677,10 @@ 7: mtfsf 0xff,fp0 8: diff --git a/packages/glibc/2.19/0017-Fix-cmpli-usage-in-power6-memset.patch b/packages/glibc/2.19/0017-Fix-cmpli-usage-in-power6-memset.patch index 5213378..a660266 100644 --- a/packages/glibc/2.19/0017-Fix-cmpli-usage-in-power6-memset.patch +++ b/packages/glibc/2.19/0017-Fix-cmpli-usage-in-power6-memset.patch @@ -24,9 +24,14 @@ the powerpc32 change. sysdeps/powerpc/powerpc32/power6/memset.S (memset): Use cmplwi instead of cmpli. sysdeps/powerpc/powerpc64/power6/memset.S (memset): Use cmpldi instead of cmpli. +--- + sysdeps/powerpc/powerpc32/power6/memset.S | 2 +- + sysdeps/powerpc/powerpc64/power6/memset.S | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + --- a/sysdeps/powerpc/powerpc32/power6/memset.S +++ b/sysdeps/powerpc/powerpc32/power6/memset.S -@@ -394,7 +394,7 @@ L(cacheAlignedx): +@@ -394,7 +394,7 @@ /* A simple loop for the longer (>640 bytes) lengths. This form limits the branch miss-predicted to exactly 1 at loop exit.*/ L(cacheAligned512): @@ -35,10 +40,9 @@ the powerpc32 change. blt cr1,L(cacheAligned1) dcbz 0,rMEMP addi rLEN,rLEN,-128 - --- a/sysdeps/powerpc/powerpc64/power6/memset.S +++ b/sysdeps/powerpc/powerpc64/power6/memset.S -@@ -251,7 +251,7 @@ L(cacheAlignedx): +@@ -251,7 +251,7 @@ /* A simple loop for the longer (>640 bytes) lengths. This form limits the branch miss-predicted to exactly 1 at loop exit.*/ L(cacheAligned512): diff --git a/packages/glibc/2.19/0017-fix-GCC-10-detection.patch b/packages/glibc/2.19/0017-fix-GCC-10-detection.patch deleted file mode 100644 index 1fe4ee8..0000000 --- a/packages/glibc/2.19/0017-fix-GCC-10-detection.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0db03b80d05d059c2f98cc9fc28cce90095d0876 Mon Sep 17 00:00:00 2001 -From: Jakub Labenski -Date: Fri, 5 Jun 2020 09:11:40 +0200 -Subject: [PATCH] Fix GCC 10+ detection - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index fc023d0c70..b201f71b4b 100755 ---- a/configure -+++ b/configure -@@ -4710,7 +4710,7 @@ $as_echo_n "checking version of $CC... " >&6; } - ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 4.[4-9].* | 4.[1-9][0-9].* | [5-9].* ) -+ 4.[4-9].* | 4.[1-9][0-9].* | [5-9].* | [1-9][0-9].* ) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - --- -2.25.1 - diff --git a/packages/glibc/2.19/0018-fix-GCC-10-detection.patch b/packages/glibc/2.19/0018-fix-GCC-10-detection.patch new file mode 100644 index 0000000..d4a7796 --- /dev/null +++ b/packages/glibc/2.19/0018-fix-GCC-10-detection.patch @@ -0,0 +1,20 @@ +From 0db03b80d05d059c2f98cc9fc28cce90095d0876 Mon Sep 17 00:00:00 2001 +From: Jakub Labenski +Date: Fri, 5 Jun 2020 09:11:40 +0200 +Subject: [PATCH] Fix GCC 10+ detection + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/configure ++++ b/configure +@@ -4710,7 +4710,7 @@ + ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 4.[4-9].* | 4.[1-9][0-9].* | [5-9].* ) ++ 4.[4-9].* | 4.[1-9][0-9].* | [5-9].* | [1-9][0-9].* ) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + diff --git a/packages/glibc/2.23/0013-Fix-cmpli-usage-in-power6-memset.patch b/packages/glibc/2.23/0013-Fix-cmpli-usage-in-power6-memset.patch index 5213378..a660266 100644 --- a/packages/glibc/2.23/0013-Fix-cmpli-usage-in-power6-memset.patch +++ b/packages/glibc/2.23/0013-Fix-cmpli-usage-in-power6-memset.patch @@ -24,9 +24,14 @@ the powerpc32 change. sysdeps/powerpc/powerpc32/power6/memset.S (memset): Use cmplwi instead of cmpli. sysdeps/powerpc/powerpc64/power6/memset.S (memset): Use cmpldi instead of cmpli. +--- + sysdeps/powerpc/powerpc32/power6/memset.S | 2 +- + sysdeps/powerpc/powerpc64/power6/memset.S | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + --- a/sysdeps/powerpc/powerpc32/power6/memset.S +++ b/sysdeps/powerpc/powerpc32/power6/memset.S -@@ -394,7 +394,7 @@ L(cacheAlignedx): +@@ -394,7 +394,7 @@ /* A simple loop for the longer (>640 bytes) lengths. This form limits the branch miss-predicted to exactly 1 at loop exit.*/ L(cacheAligned512): @@ -35,10 +40,9 @@ the powerpc32 change. blt cr1,L(cacheAligned1) dcbz 0,rMEMP addi rLEN,rLEN,-128 - --- a/sysdeps/powerpc/powerpc64/power6/memset.S +++ b/sysdeps/powerpc/powerpc64/power6/memset.S -@@ -251,7 +251,7 @@ L(cacheAlignedx): +@@ -251,7 +251,7 @@ /* A simple loop for the longer (>640 bytes) lengths. This form limits the branch miss-predicted to exactly 1 at loop exit.*/ L(cacheAligned512): diff --git a/packages/glibc/2.24/0013-fix-cmpli-usage-in-power6-memset.patch b/packages/glibc/2.24/0013-fix-cmpli-usage-in-power6-memset.patch index 9dc84b2..391d104 100644 --- a/packages/glibc/2.24/0013-fix-cmpli-usage-in-power6-memset.patch +++ b/packages/glibc/2.24/0013-fix-cmpli-usage-in-power6-memset.patch @@ -24,15 +24,13 @@ Machado Filho * sysdeps/powerpc/powerpc64/power6/memset.S (memset): Use cmpldi instead of cmpli. --- - sysdeps/powerpc/powerpc32/power6/memset.S | 2 +- - sysdeps/powerpc/powerpc64/power6/memset.S | 2 +- + sysdeps/powerpc/powerpc32/power6/memset.S | 2 +- + sysdeps/powerpc/powerpc64/power6/memset.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/sysdeps/powerpc/powerpc32/power6/memset.S b/sysdeps/powerpc/powerpc32/power6/memset.S -index b2a222edd22..d5dbe83af2f 100644 --- a/sysdeps/powerpc/powerpc32/power6/memset.S +++ b/sysdeps/powerpc/powerpc32/power6/memset.S -@@ -394,7 +394,7 @@ L(cacheAlignedx): +@@ -394,7 +394,7 @@ /* A simple loop for the longer (>640 bytes) lengths. This form limits the branch miss-predicted to exactly 1 at loop exit.*/ L(cacheAligned512): @@ -41,11 +39,9 @@ index b2a222edd22..d5dbe83af2f 100644 blt cr1,L(cacheAligned1) dcbz 0,rMEMP addi rLEN,rLEN,-128 -diff --git a/sysdeps/powerpc/powerpc64/power6/memset.S b/sysdeps/powerpc/powerpc64/power6/memset.S -index c2d1c4e600c..d445b1e1ef1 100644 --- a/sysdeps/powerpc/powerpc64/power6/memset.S +++ b/sysdeps/powerpc/powerpc64/power6/memset.S -@@ -251,7 +251,7 @@ L(cacheAlignedx): +@@ -251,7 +251,7 @@ /* A simple loop for the longer (>640 bytes) lengths. This form limits the branch miss-predicted to exactly 1 at loop exit.*/ L(cacheAligned512): diff --git a/packages/glibc/2.27/0001-Fix-build-with-GCC-10-when-long-double-double.patch b/packages/glibc/2.27/0001-Fix-build-with-GCC-10-when-long-double-double.patch index ca0d8a7..ff5fe14 100644 --- a/packages/glibc/2.27/0001-Fix-build-with-GCC-10-when-long-double-double.patch +++ b/packages/glibc/2.27/0001-Fix-build-with-GCC-10-when-long-double-double.patch @@ -25,14 +25,12 @@ irrelevant for other reasons). Tested with build-many-glibcs.py for arm-linux-gnueabi (compilers and glibcs builds), where it fixes the build that previously failed. --- - math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++ + math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) -diff --git a/math/Makefile b/math/Makefile -index 84a8b94c74..0a5a40430e 100644 --- a/math/Makefile +++ b/math/Makefile -@@ -650,6 +650,128 @@ ifneq ($(long-double-fcts),yes) +@@ -568,6 +568,128 @@ # We won't compile the `long double' code at all. Tell the `double' code # to define aliases for the `FUNCl' names. math-CPPFLAGS += -DNO_LONG_DOUBLE @@ -161,6 +159,3 @@ index 84a8b94c74..0a5a40430e 100644 endif # These files quiet sNaNs in a way that is optimized away without --- -2.25.1 - diff --git a/packages/glibc/2.28/0001-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch b/packages/glibc/2.28/0001-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch index b3c82e1..faface3 100644 --- a/packages/glibc/2.28/0001-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch +++ b/packages/glibc/2.28/0001-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch @@ -10,16 +10,13 @@ references to _dl_cet_check and _dl_open_check. (cherry picked from commit 9fb8139079ef0bb1aa33a4ae418cbb113b9b9da7) --- - NEWS | 1 + - configure | 23 ++++++++++++++++++++++- - configure.ac | 9 ++++++++- - 3 files changed, 31 insertions(+), 2 deletions(-) + configure | 23 ++++++++++++++++++++++- + configure.ac | 9 ++++++++- + 2 files changed, 30 insertions(+), 2 deletions(-) -diff --git a/configure b/configure -index fde57d63fe..c02753c0fe 100755 --- a/configure +++ b/configure -@@ -3762,11 +3762,32 @@ else +@@ -3762,11 +3762,32 @@ fi @@ -53,11 +50,9 @@ index fde57d63fe..c02753c0fe 100755 fi -diff --git a/configure.ac b/configure.ac -index 014e09a5d5..139554b94a 100644 --- a/configure.ac +++ b/configure.ac -@@ -464,11 +464,18 @@ AC_ARG_ENABLE([mathvec], +@@ -464,11 +464,18 @@ [build_mathvec=$enableval], [build_mathvec=notset]) @@ -77,6 +72,3 @@ index 014e09a5d5..139554b94a 100644 # We keep the original values in `$config_*' and never modify them, so we # can write them unchanged into config.make. Everything else uses --- -2.20.1 - diff --git a/packages/glibc/2.28/0002-Fix-build-with-GCC-10-when-long-double-double.patch b/packages/glibc/2.28/0002-Fix-build-with-GCC-10-when-long-double-double.patch index ca0d8a7..6eeb460 100644 --- a/packages/glibc/2.28/0002-Fix-build-with-GCC-10-when-long-double-double.patch +++ b/packages/glibc/2.28/0002-Fix-build-with-GCC-10-when-long-double-double.patch @@ -25,14 +25,12 @@ irrelevant for other reasons). Tested with build-many-glibcs.py for arm-linux-gnueabi (compilers and glibcs builds), where it fixes the build that previously failed. --- - math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++ + math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) -diff --git a/math/Makefile b/math/Makefile -index 84a8b94c74..0a5a40430e 100644 --- a/math/Makefile +++ b/math/Makefile -@@ -650,6 +650,128 @@ ifneq ($(long-double-fcts),yes) +@@ -664,6 +664,128 @@ # We won't compile the `long double' code at all. Tell the `double' code # to define aliases for the `FUNCl' names. math-CPPFLAGS += -DNO_LONG_DOUBLE @@ -161,6 +159,3 @@ index 84a8b94c74..0a5a40430e 100644 endif # These files quiet sNaNs in a way that is optimized away without --- -2.25.1 - diff --git a/packages/glibc/2.29/0001-Add-ARC-architecture.patch b/packages/glibc/2.29/0001-Add-ARC-architecture.patch index f7441dd..8ccdb65 100644 --- a/packages/glibc/2.29/0001-Add-ARC-architecture.patch +++ b/packages/glibc/2.29/0001-Add-ARC-architecture.patch @@ -11,11 +11,115 @@ Signed-off-by: Alexey Brodkin Upstream-Status: Pending --- -diff --git a/elf/elf.h b/elf/elf.h -index 47a514a389f..bc2184f643c 100644 +--- + elf/elf.h | 70 + scripts/build-many-glibcs.py | 4 + support/Makefile | 5 + sysdeps/arc/Implies | 4 + sysdeps/arc/Makefile | 25 + sysdeps/arc/Versions | 6 + sysdeps/arc/__longjmp.S | 50 + sysdeps/arc/abort-instr.h | 2 + sysdeps/arc/atomic-machine.h | 73 + sysdeps/arc/bits/endian.h | 12 + sysdeps/arc/bits/fenv.h | 72 + sysdeps/arc/bits/link.h | 52 + sysdeps/arc/bits/setjmp.h | 26 + sysdeps/arc/bsd-_setjmp.S | 1 + sysdeps/arc/bsd-setjmp.S | 1 + sysdeps/arc/configure | 14 + sysdeps/arc/configure.ac | 11 + sysdeps/arc/dl-machine.h | 340 +++ + sysdeps/arc/dl-runtime.c | 39 + sysdeps/arc/dl-sysdep.h | 25 + sysdeps/arc/dl-tls.h | 30 + sysdeps/arc/dl-trampoline.S | 80 + sysdeps/arc/entry.h | 5 + sysdeps/arc/gccframe.h | 21 + sysdeps/arc/gmp-mparam.h | 23 + sysdeps/arc/jmpbuf-offsets.h | 47 + sysdeps/arc/jmpbuf-unwind.h | 47 + sysdeps/arc/ldsodefs.h | 43 + sysdeps/arc/libc-tls.c | 27 + sysdeps/arc/machine-gmon.h | 35 + sysdeps/arc/memusage.h | 23 + sysdeps/arc/nofpu/Implies | 1 + sysdeps/arc/nofpu/libm-test-ulps | 390 +++ + sysdeps/arc/nofpu/libm-test-ulps-name | 1 + sysdeps/arc/nofpu/math-tests-exceptions.h | 27 + sysdeps/arc/nofpu/math-tests-rounding.h | 27 + sysdeps/arc/nptl/Makefile | 22 + sysdeps/arc/nptl/bits/pthreadtypes-arch.h | 71 + sysdeps/arc/nptl/bits/semaphore.h | 32 + sysdeps/arc/nptl/pthread-offsets.h | 4 + sysdeps/arc/nptl/pthreaddef.h | 32 + sysdeps/arc/nptl/tcb-offsets.sym | 11 + sysdeps/arc/nptl/tls.h | 150 + + sysdeps/arc/preconfigure | 14 + sysdeps/arc/setjmp.S | 66 + sysdeps/arc/sfp-machine.h | 73 + sysdeps/arc/sotruss-lib.c | 51 + sysdeps/arc/stackinfo.h | 33 + sysdeps/arc/start.S | 89 + sysdeps/arc/sysdep.h | 48 + sysdeps/arc/tls-macros.h | 47 + sysdeps/arc/tst-audit.h | 23 + sysdeps/unix/make-syscalls.sh | 2 + sysdeps/unix/sysv/linux/arc/Implies | 3 + sysdeps/unix/sysv/linux/arc/Makefile | 20 + sysdeps/unix/sysv/linux/arc/Versions | 16 + sysdeps/unix/sysv/linux/arc/bits/procfs.h | 35 + sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h | 12 + sysdeps/unix/sysv/linux/arc/c++-types.data | 67 + sysdeps/unix/sysv/linux/arc/clone.S | 98 + sysdeps/unix/sysv/linux/arc/configure | 4 + sysdeps/unix/sysv/linux/arc/configure.ac | 4 + sysdeps/unix/sysv/linux/arc/dl-static.c | 84 + sysdeps/unix/sysv/linux/arc/getcontext.S | 63 + sysdeps/unix/sysv/linux/arc/ipc_priv.h | 21 + sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h | 6 + sysdeps/unix/sysv/linux/arc/kernel-features.h | 28 + sysdeps/unix/sysv/linux/arc/ld.abilist | 9 + sysdeps/unix/sysv/linux/arc/ldsodefs.h | 32 + sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist | 1 + sysdeps/unix/sysv/linux/arc/libanl.abilist | 4 + sysdeps/unix/sysv/linux/arc/libc.abilist | 2089 ++++++++++++++++++++ + sysdeps/unix/sysv/linux/arc/libcrypt.abilist | 2 + sysdeps/unix/sysv/linux/arc/libdl.abilist | 9 + sysdeps/unix/sysv/linux/arc/libm.abilist | 753 +++++++ + sysdeps/unix/sysv/linux/arc/libpthread.abilist | 235 ++ + sysdeps/unix/sysv/linux/arc/libresolv.abilist | 79 + sysdeps/unix/sysv/linux/arc/librt.abilist | 35 + sysdeps/unix/sysv/linux/arc/libthread_db.abilist | 40 + sysdeps/unix/sysv/linux/arc/libutil.abilist | 6 + sysdeps/unix/sysv/linux/arc/localplt.data | 16 + sysdeps/unix/sysv/linux/arc/makecontext.c | 75 + sysdeps/unix/sysv/linux/arc/mmap_internal.h | 27 + sysdeps/unix/sysv/linux/arc/profil-counter.h | 2 + sysdeps/unix/sysv/linux/arc/pt-vfork.S | 1 + sysdeps/unix/sysv/linux/arc/setcontext.S | 92 + sysdeps/unix/sysv/linux/arc/shlib-versions | 2 + sysdeps/unix/sysv/linux/arc/sigaction.c | 31 + sysdeps/unix/sysv/linux/arc/sigcontextinfo.h | 23 + sysdeps/unix/sysv/linux/arc/sigrestorer.S | 29 + sysdeps/unix/sysv/linux/arc/swapcontext.S | 92 + sysdeps/unix/sysv/linux/arc/sys/cachectl.h | 36 + sysdeps/unix/sysv/linux/arc/sys/ucontext.h | 63 + sysdeps/unix/sysv/linux/arc/sys/user.h | 31 + sysdeps/unix/sysv/linux/arc/syscall.S | 38 + sysdeps/unix/sysv/linux/arc/syscalls.list | 3 + sysdeps/unix/sysv/linux/arc/sysdep.c | 33 + sysdeps/unix/sysv/linux/arc/sysdep.h | 251 ++ + sysdeps/unix/sysv/linux/arc/ucontext-macros.h | 29 + sysdeps/unix/sysv/linux/arc/ucontext_i.sym | 20 + sysdeps/unix/sysv/linux/arc/vfork.S | 42 + sysdeps/unix/sysv/linux/syscall-names.list | 3 + timezone/zic.c | 2 + 103 files changed, 7115 insertions(+), 8 deletions(-) + --- a/elf/elf.h +++ b/elf/elf.h -@@ -330,7 +330,7 @@ typedef struct +@@ -330,7 +330,7 @@ #define EM_CLOUDSHIELD 192 /* CloudShield */ #define EM_COREA_1ST 193 /* KIPO-KAIST Core-A 1st gen. */ #define EM_COREA_2ND 194 /* KIPO-KAIST Core-A 2nd gen. */ @@ -24,7 +128,7 @@ index 47a514a389f..bc2184f643c 100644 #define EM_OPEN8 196 /* Open8 RISC */ #define EM_RL78 197 /* Renesas RL78 */ #define EM_VIDEOCORE5 198 /* Broadcom VideoCore V */ -@@ -3996,6 +3996,74 @@ enum +@@ -3996,6 +3996,74 @@ #define R_NDS32_TLS_TPOFF 102 #define R_NDS32_TLS_DESC 119 @@ -99,11 +203,9 @@ index 47a514a389f..bc2184f643c 100644 __END_DECLS #endif /* elf.h */ -diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py -index 025876486a3..40bf9398d48 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py -@@ -155,6 +155,9 @@ class Context(object): +@@ -155,6 +155,9 @@ 'cfg': ['--disable-multi-arch']}]) self.add_config(arch='aarch64_be', os_name='linux-gnu') @@ -113,7 +215,7 @@ index 025876486a3..40bf9398d48 100755 self.add_config(arch='alpha', os_name='linux-gnu') self.add_config(arch='arm', -@@ -1265,6 +1268,7 @@ class Config(object): +@@ -1265,6 +1268,7 @@ def install_linux_headers(self, cmdlist): """Install Linux kernel headers.""" arch_map = {'aarch64': 'arm64', @@ -121,11 +223,9 @@ index 025876486a3..40bf9398d48 100755 'alpha': 'alpha', 'arm': 'arm', 'csky': 'csky', -diff --git a/support/Makefile b/support/Makefile -index 432cf2fe6cb..e2a0c0cccf4 100644 --- a/support/Makefile +++ b/support/Makefile -@@ -169,12 +169,7 @@ CFLAGS-support_paths.c = \ +@@ -169,12 +169,7 @@ -DINSTDIR_PATH=\"$(prefix)\" \ -DLIBDIR_PATH=\"$(libdir)\" @@ -138,9 +238,6 @@ index 432cf2fe6cb..e2a0c0cccf4 100644 LDLIBS-test-container = $(libsupport) -diff --git a/sysdeps/arc/Implies b/sysdeps/arc/Implies -new file mode 100644 -index 00000000000..a0f0b00cfac --- /dev/null +++ b/sysdeps/arc/Implies @@ -0,0 +1,4 @@ @@ -148,9 +245,6 @@ index 00000000000..a0f0b00cfac +wordsize-32 +ieee754/flt-32 +ieee754/dbl-64 -diff --git a/sysdeps/arc/Makefile b/sysdeps/arc/Makefile -new file mode 100644 -index 00000000000..8d2fbe00c5e --- /dev/null +++ b/sysdeps/arc/Makefile @@ -0,0 +1,25 @@ @@ -179,9 +273,6 @@ index 00000000000..8d2fbe00c5e +ifeq ($(subdir),debug) +CFLAGS-backtrace.c += -funwind-tables +endif -diff --git a/sysdeps/arc/Versions b/sysdeps/arc/Versions -new file mode 100644 -index 00000000000..a41ad34f953 --- /dev/null +++ b/sysdeps/arc/Versions @@ -0,0 +1,6 @@ @@ -191,9 +282,6 @@ index 00000000000..a41ad34f953 + __mcount; + } +} -diff --git a/sysdeps/arc/__longjmp.S b/sysdeps/arc/__longjmp.S -new file mode 100644 -index 00000000000..8296aa445f6 --- /dev/null +++ b/sysdeps/arc/__longjmp.S @@ -0,0 +1,50 @@ @@ -247,17 +335,11 @@ index 00000000000..8296aa445f6 + mov.z r0, 1 ; can't let setjmp return 0 when it is due to longjmp + +END (__longjmp) -diff --git a/sysdeps/arc/abort-instr.h b/sysdeps/arc/abort-instr.h -new file mode 100644 -index 00000000000..49f33613c40 --- /dev/null +++ b/sysdeps/arc/abort-instr.h @@ -0,0 +1,2 @@ +/* FLAG 1 is privilege mode only instruction, hence will crash any program. */ +#define ABORT_INSTRUCTION asm ("flag 1") -diff --git a/sysdeps/arc/atomic-machine.h b/sysdeps/arc/atomic-machine.h -new file mode 100644 -index 00000000000..bdc91d0558f --- /dev/null +++ b/sysdeps/arc/atomic-machine.h @@ -0,0 +1,73 @@ @@ -334,9 +416,6 @@ index 00000000000..bdc91d0558f +#endif + +#endif /* _ARC_BITS_ATOMIC_H */ -diff --git a/sysdeps/arc/bits/endian.h b/sysdeps/arc/bits/endian.h -new file mode 100644 -index 00000000000..46f41e3cffe --- /dev/null +++ b/sysdeps/arc/bits/endian.h @@ -0,0 +1,12 @@ @@ -352,9 +431,6 @@ index 00000000000..46f41e3cffe +#ifdef __BIG_ENDIAN__ +# error "Big Endian NOt supported on ARC" +#endif -diff --git a/sysdeps/arc/bits/fenv.h b/sysdeps/arc/bits/fenv.h -new file mode 100644 -index 00000000000..58388fb43a3 --- /dev/null +++ b/sysdeps/arc/bits/fenv.h @@ -0,0 +1,72 @@ @@ -430,9 +506,6 @@ index 00000000000..58388fb43a3 +/* Default floating-point control modes. */ +# define FE_DFL_MODE ((const femode_t *) -1L) +#endif -diff --git a/sysdeps/arc/bits/link.h b/sysdeps/arc/bits/link.h -new file mode 100644 -index 00000000000..c4508ab6664 --- /dev/null +++ b/sysdeps/arc/bits/link.h @@ -0,0 +1,52 @@ @@ -488,9 +561,6 @@ index 00000000000..c4508ab6664 + const char *symname); + +__END_DECLS -diff --git a/sysdeps/arc/bits/setjmp.h b/sysdeps/arc/bits/setjmp.h -new file mode 100644 -index 00000000000..3cb457d097c --- /dev/null +++ b/sysdeps/arc/bits/setjmp.h @@ -0,0 +1,26 @@ @@ -520,23 +590,14 @@ index 00000000000..3cb457d097c +typedef long int __jmp_buf[32]; + +#endif -diff --git a/sysdeps/arc/bsd-_setjmp.S b/sysdeps/arc/bsd-_setjmp.S -new file mode 100644 -index 00000000000..90b99cd8c3e --- /dev/null +++ b/sysdeps/arc/bsd-_setjmp.S @@ -0,0 +1 @@ +/* _setjmp is in setjmp.S. */ -diff --git a/sysdeps/arc/bsd-setjmp.S b/sysdeps/arc/bsd-setjmp.S -new file mode 100644 -index 00000000000..d3b823c118b --- /dev/null +++ b/sysdeps/arc/bsd-setjmp.S @@ -0,0 +1 @@ +/* setjmp is in setjmp.S. */ -diff --git a/sysdeps/arc/configure b/sysdeps/arc/configure -new file mode 100644 -index 00000000000..52e286da2eb --- /dev/null +++ b/sysdeps/arc/configure @@ -0,0 +1,14 @@ @@ -554,9 +615,6 @@ index 00000000000..52e286da2eb +cat >>confdefs.h <<_ACEOF +#define ASM_LINE_SEP $libc_cv_asm_line_sep +_ACEOF -diff --git a/sysdeps/arc/configure.ac b/sysdeps/arc/configure.ac -new file mode 100644 -index 00000000000..1074d312f03 --- /dev/null +++ b/sysdeps/arc/configure.ac @@ -0,0 +1,11 @@ @@ -571,9 +629,6 @@ index 00000000000..1074d312f03 +# canonical newline as there's lots of code out there which will break +libc_cv_asm_line_sep='`' +AC_DEFINE_UNQUOTED(ASM_LINE_SEP, $libc_cv_asm_line_sep) -diff --git a/sysdeps/arc/dl-machine.h b/sysdeps/arc/dl-machine.h -new file mode 100644 -index 00000000000..c81acb9d4fd --- /dev/null +++ b/sysdeps/arc/dl-machine.h @@ -0,0 +1,340 @@ @@ -917,9 +972,6 @@ index 00000000000..c81acb9d4fd +} + +#endif /* RESOLVE_MAP */ -diff --git a/sysdeps/arc/dl-runtime.c b/sysdeps/arc/dl-runtime.c -new file mode 100644 -index 00000000000..48f4a5a7e1d --- /dev/null +++ b/sysdeps/arc/dl-runtime.c @@ -0,0 +1,39 @@ @@ -962,9 +1014,6 @@ index 00000000000..48f4a5a7e1d +#define reloc_offset reloc_index * sizeof (PLTREL) + +#include -diff --git a/sysdeps/arc/dl-sysdep.h b/sysdeps/arc/dl-sysdep.h -new file mode 100644 -index 00000000000..ffc30b69372 --- /dev/null +++ b/sysdeps/arc/dl-sysdep.h @@ -0,0 +1,25 @@ @@ -993,9 +1042,6 @@ index 00000000000..ffc30b69372 +#define DL_ARGV_NOT_RELRO 1 + +#define DL_EXTERN_PROTECTED_DATA -diff --git a/sysdeps/arc/dl-tls.h b/sysdeps/arc/dl-tls.h -new file mode 100644 -index 00000000000..7f0cf91e402 --- /dev/null +++ b/sysdeps/arc/dl-tls.h @@ -0,0 +1,30 @@ @@ -1029,9 +1075,6 @@ index 00000000000..7f0cf91e402 + +/* Value used for dtv entries for which the allocation is delayed. */ +#define TLS_DTV_UNALLOCATED ((void *) -1l) -diff --git a/sysdeps/arc/dl-trampoline.S b/sysdeps/arc/dl-trampoline.S -new file mode 100644 -index 00000000000..9da75fb1fe2 --- /dev/null +++ b/sysdeps/arc/dl-trampoline.S @@ -0,0 +1,80 @@ @@ -1115,9 +1158,6 @@ index 00000000000..9da75fb1fe2 + cfi_adjust_cfa_offset (-4) + cfi_restore (r0) +END (_dl_runtime_resolve) -diff --git a/sysdeps/arc/entry.h b/sysdeps/arc/entry.h -new file mode 100644 -index 00000000000..adb01d981af --- /dev/null +++ b/sysdeps/arc/entry.h @@ -0,0 +1,5 @@ @@ -1126,9 +1166,6 @@ index 00000000000..adb01d981af +#endif + +#define ENTRY_POINT __start -diff --git a/sysdeps/arc/gccframe.h b/sysdeps/arc/gccframe.h -new file mode 100644 -index 00000000000..40487fa77b4 --- /dev/null +++ b/sysdeps/arc/gccframe.h @@ -0,0 +1,21 @@ @@ -1153,9 +1190,6 @@ index 00000000000..40487fa77b4 +#define FIRST_PSEUDO_REGISTER 40 + +#include -diff --git a/sysdeps/arc/gmp-mparam.h b/sysdeps/arc/gmp-mparam.h -new file mode 100644 -index 00000000000..e30695fc6b2 --- /dev/null +++ b/sysdeps/arc/gmp-mparam.h @@ -0,0 +1,23 @@ @@ -1182,9 +1216,6 @@ index 00000000000..e30695fc6b2 +#include + +#define IEEE_DOUBLE_BIG_ENDIAN 0 -diff --git a/sysdeps/arc/jmpbuf-offsets.h b/sysdeps/arc/jmpbuf-offsets.h -new file mode 100644 -index 00000000000..9760f3a3891 --- /dev/null +++ b/sysdeps/arc/jmpbuf-offsets.h @@ -0,0 +1,47 @@ @@ -1235,9 +1266,6 @@ index 00000000000..9760f3a3891 + +/* Helper for generic ____longjmp_chk(). */ +#define JB_FRAME_ADDRESS(buf) ((void *) (unsigned long int) (buf[JB_SP])) -diff --git a/sysdeps/arc/jmpbuf-unwind.h b/sysdeps/arc/jmpbuf-unwind.h -new file mode 100644 -index 00000000000..47be5758c75 --- /dev/null +++ b/sysdeps/arc/jmpbuf-unwind.h @@ -0,0 +1,47 @@ @@ -1288,9 +1316,6 @@ index 00000000000..47be5758c75 + +/* We use the normal longjmp for unwinding. */ +#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) -diff --git a/sysdeps/arc/ldsodefs.h b/sysdeps/arc/ldsodefs.h -new file mode 100644 -index 00000000000..53ef4e1e83d --- /dev/null +++ b/sysdeps/arc/ldsodefs.h @@ -0,0 +1,43 @@ @@ -1337,9 +1362,6 @@ index 00000000000..53ef4e1e83d +#include_next + +#endif -diff --git a/sysdeps/arc/libc-tls.c b/sysdeps/arc/libc-tls.c -new file mode 100644 -index 00000000000..903a75a41b5 --- /dev/null +++ b/sysdeps/arc/libc-tls.c @@ -0,0 +1,27 @@ @@ -1370,9 +1392,6 @@ index 00000000000..903a75a41b5 + dtv_t *dtv = THREAD_DTV (); + return (char *) dtv[1].pointer.val + ti->ti_offset; +} -diff --git a/sysdeps/arc/machine-gmon.h b/sysdeps/arc/machine-gmon.h -new file mode 100644 -index 00000000000..1d9e8108d9b --- /dev/null +++ b/sysdeps/arc/machine-gmon.h @@ -0,0 +1,35 @@ @@ -1411,9 +1430,6 @@ index 00000000000..1d9e8108d9b + __mcount_internal ((unsigned long int) frompc, \ + (unsigned long int) __builtin_return_address(0)); \ +} -diff --git a/sysdeps/arc/memusage.h b/sysdeps/arc/memusage.h -new file mode 100644 -index 00000000000..29f234f5bac --- /dev/null +++ b/sysdeps/arc/memusage.h @@ -0,0 +1,23 @@ @@ -1440,16 +1456,10 @@ index 00000000000..29f234f5bac +#define uatomic32_t unsigned int + +#include -diff --git a/sysdeps/arc/nofpu/Implies b/sysdeps/arc/nofpu/Implies -new file mode 100644 -index 00000000000..abcbadb25f2 --- /dev/null +++ b/sysdeps/arc/nofpu/Implies @@ -0,0 +1 @@ +ieee754/soft-fp -diff --git a/sysdeps/arc/nofpu/libm-test-ulps b/sysdeps/arc/nofpu/libm-test-ulps -new file mode 100644 -index 00000000000..0e8ef313fa9 --- /dev/null +++ b/sysdeps/arc/nofpu/libm-test-ulps @@ -0,0 +1,390 @@ @@ -1843,16 +1853,10 @@ index 00000000000..0e8ef313fa9 +ifloat: 3 + +# end of automatic generation -diff --git a/sysdeps/arc/nofpu/libm-test-ulps-name b/sysdeps/arc/nofpu/libm-test-ulps-name -new file mode 100644 -index 00000000000..8c4fba4f9ae --- /dev/null +++ b/sysdeps/arc/nofpu/libm-test-ulps-name @@ -0,0 +1 @@ +ARC -diff --git a/sysdeps/arc/nofpu/math-tests-exceptions.h b/sysdeps/arc/nofpu/math-tests-exceptions.h -new file mode 100644 -index 00000000000..f5c0b73589e --- /dev/null +++ b/sysdeps/arc/nofpu/math-tests-exceptions.h @@ -0,0 +1,27 @@ @@ -1883,9 +1887,6 @@ index 00000000000..f5c0b73589e +#define EXCEPTION_TESTS_long_double 0 + +#endif -diff --git a/sysdeps/arc/nofpu/math-tests-rounding.h b/sysdeps/arc/nofpu/math-tests-rounding.h -new file mode 100644 -index 00000000000..e8f76338b1e --- /dev/null +++ b/sysdeps/arc/nofpu/math-tests-rounding.h @@ -0,0 +1,27 @@ @@ -1916,9 +1917,6 @@ index 00000000000..e8f76338b1e +#define ROUNDING_TESTS_long_double(MODE) ((MODE) == FE_TONEAREST) + +#endif -diff --git a/sysdeps/arc/nptl/Makefile b/sysdeps/arc/nptl/Makefile -new file mode 100644 -index 00000000000..3c33c9cc112 --- /dev/null +++ b/sysdeps/arc/nptl/Makefile @@ -0,0 +1,22 @@ @@ -1944,9 +1942,6 @@ index 00000000000..3c33c9cc112 +ifeq ($(subdir),csu) +gen-as-const-headers += tcb-offsets.sym +endif -diff --git a/sysdeps/arc/nptl/bits/pthreadtypes-arch.h b/sysdeps/arc/nptl/bits/pthreadtypes-arch.h -new file mode 100644 -index 00000000000..eae884f61cf --- /dev/null +++ b/sysdeps/arc/nptl/bits/pthreadtypes-arch.h @@ -0,0 +1,71 @@ @@ -2021,9 +2016,6 @@ index 00000000000..eae884f61cf +#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 + +#endif /* bits/pthreadtypes-arch.h */ -diff --git a/sysdeps/arc/nptl/bits/semaphore.h b/sysdeps/arc/nptl/bits/semaphore.h -new file mode 100644 -index 00000000000..662d08401d0 --- /dev/null +++ b/sysdeps/arc/nptl/bits/semaphore.h @@ -0,0 +1,32 @@ @@ -2059,9 +2051,6 @@ index 00000000000..662d08401d0 + char __size[__SIZEOF_SEM_T]; + long int __align; +} sem_t; -diff --git a/sysdeps/arc/nptl/pthread-offsets.h b/sysdeps/arc/nptl/pthread-offsets.h -new file mode 100644 -index 00000000000..c363e8cda8d --- /dev/null +++ b/sysdeps/arc/nptl/pthread-offsets.h @@ -0,0 +1,4 @@ @@ -2069,9 +2058,6 @@ index 00000000000..c363e8cda8d +#define __PTHREAD_MUTEX_KIND_OFFSET 16 +#define __PTHREAD_MUTEX_SPINS_OFFSET 20 +#define __PTHREAD_MUTEX_LIST_OFFSET 24 -diff --git a/sysdeps/arc/nptl/pthreaddef.h b/sysdeps/arc/nptl/pthreaddef.h -new file mode 100644 -index 00000000000..80a109bbd52 --- /dev/null +++ b/sysdeps/arc/nptl/pthreaddef.h @@ -0,0 +1,32 @@ @@ -2107,9 +2093,6 @@ index 00000000000..80a109bbd52 + +/* Location of current stack frame. */ +#define CURRENT_STACK_FRAME __builtin_frame_address (0) -diff --git a/sysdeps/arc/nptl/tcb-offsets.sym b/sysdeps/arc/nptl/tcb-offsets.sym -new file mode 100644 -index 00000000000..56950e0676e --- /dev/null +++ b/sysdeps/arc/nptl/tcb-offsets.sym @@ -0,0 +1,11 @@ @@ -2124,9 +2107,6 @@ index 00000000000..56950e0676e +TLS_TCB_SIZE sizeof(tcbhead_t) + +PTHREAD_TID offsetof(struct pthread, tid) -diff --git a/sysdeps/arc/nptl/tls.h b/sysdeps/arc/nptl/tls.h -new file mode 100644 -index 00000000000..2c90109d570 --- /dev/null +++ b/sysdeps/arc/nptl/tls.h @@ -0,0 +1,150 @@ @@ -2280,9 +2260,6 @@ index 00000000000..2c90109d570 +#endif /* __ASSEMBLER__ */ + +#endif /* tls.h */ -diff --git a/sysdeps/arc/preconfigure b/sysdeps/arc/preconfigure -new file mode 100644 -index 00000000000..1152a179c4a --- /dev/null +++ b/sysdeps/arc/preconfigure @@ -0,0 +1,14 @@ @@ -2300,9 +2277,6 @@ index 00000000000..1152a179c4a + fi + ;; +esac -diff --git a/sysdeps/arc/setjmp.S b/sysdeps/arc/setjmp.S -new file mode 100644 -index 00000000000..518545a99e8 --- /dev/null +++ b/sysdeps/arc/setjmp.S @@ -0,0 +1,66 @@ @@ -2372,9 +2346,6 @@ index 00000000000..518545a99e8 +END (__sigsetjmp) + +libc_hidden_def (__sigsetjmp) -diff --git a/sysdeps/arc/sfp-machine.h b/sysdeps/arc/sfp-machine.h -new file mode 100644 -index 00000000000..5ceaf56a988 --- /dev/null +++ b/sysdeps/arc/sfp-machine.h @@ -0,0 +1,73 @@ @@ -2451,9 +2422,6 @@ index 00000000000..5ceaf56a988 + } while (0) + +#define _FP_TININESS_AFTER_ROUNDING 0 -diff --git a/sysdeps/arc/sotruss-lib.c b/sysdeps/arc/sotruss-lib.c -new file mode 100644 -index 00000000000..ffbb5bbd6d0 --- /dev/null +++ b/sysdeps/arc/sotruss-lib.c @@ -0,0 +1,51 @@ @@ -2508,9 +2476,6 @@ index 00000000000..ffbb5bbd6d0 + + return 0; +} -diff --git a/sysdeps/arc/stackinfo.h b/sysdeps/arc/stackinfo.h -new file mode 100644 -index 00000000000..fe69161382a --- /dev/null +++ b/sysdeps/arc/stackinfo.h @@ -0,0 +1,33 @@ @@ -2547,9 +2512,6 @@ index 00000000000..fe69161382a +#define DEFAULT_STACK_PERMS (PF_R|PF_W) + +#endif /* stackinfo.h */ -diff --git a/sysdeps/arc/start.S b/sysdeps/arc/start.S -new file mode 100644 -index 00000000000..4ade1e871f6 --- /dev/null +++ b/sysdeps/arc/start.S @@ -0,0 +1,89 @@ @@ -2642,9 +2604,6 @@ index 00000000000..4ade1e871f6 + .long 0 + .weak data_start + data_start = __data_start -diff --git a/sysdeps/arc/sysdep.h b/sysdeps/arc/sysdep.h -new file mode 100644 -index 00000000000..127e9b01e73 --- /dev/null +++ b/sysdeps/arc/sysdep.h @@ -0,0 +1,48 @@ @@ -2696,9 +2655,6 @@ index 00000000000..127e9b01e73 +# define CALL_MCOUNT /* Do nothing for now. */ + +#endif /* __ASSEMBLER__ */ -diff --git a/sysdeps/arc/tls-macros.h b/sysdeps/arc/tls-macros.h -new file mode 100644 -index 00000000000..4d54683eda4 --- /dev/null +++ b/sysdeps/arc/tls-macros.h @@ -0,0 +1,47 @@ @@ -2749,9 +2705,6 @@ index 00000000000..4d54683eda4 + "add %0, %1, %0 \n" \ + : "=&r" (__result) : "r" (tp)); \ + __result; }) -diff --git a/sysdeps/arc/tst-audit.h b/sysdeps/arc/tst-audit.h -new file mode 100644 -index 00000000000..9237ad2440c --- /dev/null +++ b/sysdeps/arc/tst-audit.h @@ -0,0 +1,23 @@ @@ -2778,8 +2731,6 @@ index 00000000000..9237ad2440c +#define La_regs La_arc_regs +#define La_retval La_arc_retval +#define int_retval lrv_reg[0] -diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh -index e39b2d6d521..6a5c10d54e8 100644 --- a/sysdeps/unix/make-syscalls.sh +++ b/sysdeps/unix/make-syscalls.sh @@ -7,7 +7,7 @@ @@ -2791,18 +2742,12 @@ index e39b2d6d521..6a5c10d54e8 100644 # actual wrapper. # # Syscall Signature Prefixes: -diff --git a/sysdeps/unix/sysv/linux/arc/Implies b/sysdeps/unix/sysv/linux/arc/Implies -new file mode 100644 -index 00000000000..7f739a0340b --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/Implies @@ -0,0 +1,3 @@ +arc/nptl +unix/sysv/linux/generic/wordsize-32 +unix/sysv/linux/generic -diff --git a/sysdeps/unix/sysv/linux/arc/Makefile b/sysdeps/unix/sysv/linux/arc/Makefile -new file mode 100644 -index 00000000000..a6c6dfc6ec6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/Makefile @@ -0,0 +1,20 @@ @@ -2826,9 +2771,6 @@ index 00000000000..a6c6dfc6ec6 +sysdep-dl-routines += dl-static +endif +endif -diff --git a/sysdeps/unix/sysv/linux/arc/Versions b/sysdeps/unix/sysv/linux/arc/Versions -new file mode 100644 -index 00000000000..3d12161f7fe --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/Versions @@ -0,0 +1,16 @@ @@ -2848,9 +2790,6 @@ index 00000000000..3d12161f7fe + __default_rt_sa_restorer; + } +} -diff --git a/sysdeps/unix/sysv/linux/arc/bits/procfs.h b/sysdeps/unix/sysv/linux/arc/bits/procfs.h -new file mode 100644 -index 00000000000..b37deaee587 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/bits/procfs.h @@ -0,0 +1,35 @@ @@ -2889,9 +2828,6 @@ index 00000000000..b37deaee587 + +/* There's no seperate floating point reg file in ARCv2. */ +typedef struct { } elf_fpregset_t; -diff --git a/sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h b/sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h -new file mode 100644 -index 00000000000..795638a30bd --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h @@ -0,0 +1,12 @@ @@ -2907,9 +2843,6 @@ index 00000000000..795638a30bd +} __sigset_t; + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/c++-types.data b/sysdeps/unix/sysv/linux/arc/c++-types.data -new file mode 100644 -index 00000000000..303f4570c8e --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/c++-types.data @@ -0,0 +1,67 @@ @@ -2980,9 +2913,6 @@ index 00000000000..303f4570c8e +useconds_t:j +ushort:t +u_short:t -diff --git a/sysdeps/unix/sysv/linux/arc/clone.S b/sysdeps/unix/sysv/linux/arc/clone.S -new file mode 100644 -index 00000000000..55c2a2b60ed --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/clone.S @@ -0,0 +1,98 @@ @@ -3084,9 +3014,6 @@ index 00000000000..55c2a2b60ed +PSEUDO_END (__clone) +libc_hidden_def (__clone) +weak_alias (__clone, clone) -diff --git a/sysdeps/unix/sysv/linux/arc/configure b/sysdeps/unix/sysv/linux/arc/configure -new file mode 100644 -index 00000000000..f74fa7cb025 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/configure @@ -0,0 +1,4 @@ @@ -3094,9 +3021,6 @@ index 00000000000..f74fa7cb025 + # Local configure fragment for sysdeps/unix/sysv/linux/arc. + +arch_minimum_kernel=3.9.0 -diff --git a/sysdeps/unix/sysv/linux/arc/configure.ac b/sysdeps/unix/sysv/linux/arc/configure.ac -new file mode 100644 -index 00000000000..a9528032d32 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/configure.ac @@ -0,0 +1,4 @@ @@ -3104,9 +3028,6 @@ index 00000000000..a9528032d32 +# Local configure fragment for sysdeps/unix/sysv/linux/arc. + +arch_minimum_kernel=3.9.0 -diff --git a/sysdeps/unix/sysv/linux/arc/dl-static.c b/sysdeps/unix/sysv/linux/arc/dl-static.c -new file mode 100644 -index 00000000000..1a8757c9840 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/dl-static.c @@ -0,0 +1,84 @@ @@ -3194,9 +3115,6 @@ index 00000000000..1a8757c9840 +} + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/getcontext.S b/sysdeps/unix/sysv/linux/arc/getcontext.S -new file mode 100644 -index 00000000000..723cc237d87 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/getcontext.S @@ -0,0 +1,63 @@ @@ -3263,9 +3181,6 @@ index 00000000000..723cc237d87 + +PSEUDO_END (__getcontext) +weak_alias (__getcontext, getcontext) -diff --git a/sysdeps/unix/sysv/linux/arc/ipc_priv.h b/sysdeps/unix/sysv/linux/arc/ipc_priv.h -new file mode 100644 -index 00000000000..309eb3064e9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ipc_priv.h @@ -0,0 +1,21 @@ @@ -3290,9 +3205,6 @@ index 00000000000..309eb3064e9 +#include /* For __key_t */ + +#define __IPC_64 0x0 -diff --git a/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h -new file mode 100644 -index 00000000000..6c129398483 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h @@ -0,0 +1,6 @@ @@ -3302,9 +3214,6 @@ index 00000000000..6c129398483 +#define SIGJMP_BUF_ALIGN __alignof__ (unsigned long int) +#define MASK_WAS_SAVED_OFFSET (32 * sizeof (unsigned long int)) +#define SAVED_MASK_OFFSET (33 * sizeof (unsigned long int)) -diff --git a/sysdeps/unix/sysv/linux/arc/kernel-features.h b/sysdeps/unix/sysv/linux/arc/kernel-features.h -new file mode 100644 -index 00000000000..00255337bc8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/kernel-features.h @@ -0,0 +1,28 @@ @@ -3336,9 +3245,6 @@ index 00000000000..00255337bc8 + +#undef __ASSUME_CLONE_DEFAULT +#define __ASSUME_CLONE_BACKWARDS 1 -diff --git a/sysdeps/unix/sysv/linux/arc/ld.abilist b/sysdeps/unix/sysv/linux/arc/ld.abilist -new file mode 100644 -index 00000000000..71576160edd --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ld.abilist @@ -0,0 +1,9 @@ @@ -3351,9 +3257,6 @@ index 00000000000..71576160edd +GLIBC_2.29 free F +GLIBC_2.29 malloc F +GLIBC_2.29 realloc F -diff --git a/sysdeps/unix/sysv/linux/arc/ldsodefs.h b/sysdeps/unix/sysv/linux/arc/ldsodefs.h -new file mode 100644 -index 00000000000..8c5c6800af1 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ldsodefs.h @@ -0,0 +1,32 @@ @@ -3389,16 +3292,10 @@ index 00000000000..8c5c6800af1 +#define DL_STATIC_INIT(map) _dl_static_init (map) + +#endif /* ldsodefs.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist -new file mode 100644 -index 00000000000..96b4163a254 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist @@ -0,0 +1 @@ +GLIBC_2.29 __ctype_get_mb_cur_max F -diff --git a/sysdeps/unix/sysv/linux/arc/libanl.abilist b/sysdeps/unix/sysv/linux/arc/libanl.abilist -new file mode 100644 -index 00000000000..416a6f8ddb2 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libanl.abilist @@ -0,0 +1,4 @@ @@ -3406,9 +3303,6 @@ index 00000000000..416a6f8ddb2 +GLIBC_2.29 gai_error F +GLIBC_2.29 gai_suspend F +GLIBC_2.29 getaddrinfo_a F -diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist -new file mode 100644 -index 00000000000..1e9a5dc9f09 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -0,0 +1,2089 @@ @@ -5501,17 +5395,11 @@ index 00000000000..1e9a5dc9f09 +GLIBC_2.29 xencrypt F +GLIBC_2.29 xprt_register F +GLIBC_2.29 xprt_unregister F -diff --git a/sysdeps/unix/sysv/linux/arc/libcrypt.abilist b/sysdeps/unix/sysv/linux/arc/libcrypt.abilist -new file mode 100644 -index 00000000000..da3abbf8fb8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libcrypt.abilist @@ -0,0 +1,2 @@ +GLIBC_2.29 crypt F +GLIBC_2.29 crypt_r F -diff --git a/sysdeps/unix/sysv/linux/arc/libdl.abilist b/sysdeps/unix/sysv/linux/arc/libdl.abilist -new file mode 100644 -index 00000000000..8fcb609ddcf --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libdl.abilist @@ -0,0 +1,9 @@ @@ -5524,9 +5412,6 @@ index 00000000000..8fcb609ddcf +GLIBC_2.29 dlopen F +GLIBC_2.29 dlsym F +GLIBC_2.29 dlvsym F -diff --git a/sysdeps/unix/sysv/linux/arc/libm.abilist b/sysdeps/unix/sysv/linux/arc/libm.abilist -new file mode 100644 -index 00000000000..497f6226447 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libm.abilist @@ -0,0 +1,753 @@ @@ -6283,9 +6168,6 @@ index 00000000000..497f6226447 +GLIBC_2.29 ynf32x F +GLIBC_2.29 ynf64 F +GLIBC_2.29 ynl F -diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist -new file mode 100644 -index 00000000000..ea4b79a518e --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -0,0 +1,235 @@ @@ -6524,9 +6406,6 @@ index 00000000000..ea4b79a518e +GLIBC_2.29 wait F +GLIBC_2.29 waitpid F +GLIBC_2.29 write F -diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist -new file mode 100644 -index 00000000000..2830a7efd17 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist @@ -0,0 +1,79 @@ @@ -6609,9 +6488,6 @@ index 00000000000..2830a7efd17 +GLIBC_2.29 ns_sprintrr F +GLIBC_2.29 ns_sprintrrf F +GLIBC_2.29 ns_subdomain F -diff --git a/sysdeps/unix/sysv/linux/arc/librt.abilist b/sysdeps/unix/sysv/linux/arc/librt.abilist -new file mode 100644 -index 00000000000..c6690ef7c13 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/librt.abilist @@ -0,0 +1,35 @@ @@ -6650,9 +6526,6 @@ index 00000000000..c6690ef7c13 +GLIBC_2.29 timer_getoverrun F +GLIBC_2.29 timer_gettime F +GLIBC_2.29 timer_settime F -diff --git a/sysdeps/unix/sysv/linux/arc/libthread_db.abilist b/sysdeps/unix/sysv/linux/arc/libthread_db.abilist -new file mode 100644 -index 00000000000..37e9bace552 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libthread_db.abilist @@ -0,0 +1,40 @@ @@ -6696,9 +6569,6 @@ index 00000000000..37e9bace552 +GLIBC_2.29 td_thr_tlsbase F +GLIBC_2.29 td_thr_tsd F +GLIBC_2.29 td_thr_validate F -diff --git a/sysdeps/unix/sysv/linux/arc/libutil.abilist b/sysdeps/unix/sysv/linux/arc/libutil.abilist -new file mode 100644 -index 00000000000..cbd11999a4f --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libutil.abilist @@ -0,0 +1,6 @@ @@ -6708,9 +6578,6 @@ index 00000000000..cbd11999a4f +GLIBC_2.29 logout F +GLIBC_2.29 logwtmp F +GLIBC_2.29 openpty F -diff --git a/sysdeps/unix/sysv/linux/arc/localplt.data b/sysdeps/unix/sysv/linux/arc/localplt.data -new file mode 100644 -index 00000000000..e902fd0607a --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/localplt.data @@ -0,0 +1,16 @@ @@ -6730,9 +6597,6 @@ index 00000000000..e902fd0607a +ld.so: _dl_catch_error +ld.so: _dl_signal_exception +ld.so: _dl_catch_exception -diff --git a/sysdeps/unix/sysv/linux/arc/makecontext.c b/sysdeps/unix/sysv/linux/arc/makecontext.c -new file mode 100644 -index 00000000000..3d46452e175 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/makecontext.c @@ -0,0 +1,75 @@ @@ -6811,9 +6675,6 @@ index 00000000000..3d46452e175 +} + +weak_alias (__makecontext, makecontext) -diff --git a/sysdeps/unix/sysv/linux/arc/mmap_internal.h b/sysdeps/unix/sysv/linux/arc/mmap_internal.h -new file mode 100644 -index 00000000000..3f28f352d91 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/mmap_internal.h @@ -0,0 +1,27 @@ @@ -6844,24 +6705,15 @@ index 00000000000..3f28f352d91 +#include_next + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/profil-counter.h b/sysdeps/unix/sysv/linux/arc/profil-counter.h -new file mode 100644 -index 00000000000..8a6a0bcf3d5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/profil-counter.h @@ -0,0 +1,2 @@ +/* We can use the ix86 version. */ +#include -diff --git a/sysdeps/unix/sysv/linux/arc/pt-vfork.S b/sysdeps/unix/sysv/linux/arc/pt-vfork.S -new file mode 100644 -index 00000000000..1cc89317007 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/pt-vfork.S @@ -0,0 +1 @@ +/* Not needed. */ -diff --git a/sysdeps/unix/sysv/linux/arc/setcontext.S b/sysdeps/unix/sysv/linux/arc/setcontext.S -new file mode 100644 -index 00000000000..8cf4ffcaf5a --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/setcontext.S @@ -0,0 +1,92 @@ @@ -6957,17 +6809,11 @@ index 00000000000..8cf4ffcaf5a + /* Exit with status 0. */ + b HIDDEN_JUMPTARGET(exit) +END (__startcontext) -diff --git a/sysdeps/unix/sysv/linux/arc/shlib-versions b/sysdeps/unix/sysv/linux/arc/shlib-versions -new file mode 100644 -index 00000000000..e527acd7789 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/shlib-versions @@ -0,0 +1,2 @@ +DEFAULT GLIBC_2.29 +ld=ld-linux-arc.so.2 -diff --git a/sysdeps/unix/sysv/linux/arc/sigaction.c b/sysdeps/unix/sysv/linux/arc/sigaction.c -new file mode 100644 -index 00000000000..db7293865f3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sigaction.c @@ -0,0 +1,31 @@ @@ -7002,9 +6848,6 @@ index 00000000000..db7293865f3 +#define RESET_SA_RESTORER(act, kact) + +#include -diff --git a/sysdeps/unix/sysv/linux/arc/sigcontextinfo.h b/sysdeps/unix/sysv/linux/arc/sigcontextinfo.h -new file mode 100644 -index 00000000000..acf03c6afd9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sigcontextinfo.h @@ -0,0 +1,23 @@ @@ -7031,9 +6874,6 @@ index 00000000000..acf03c6afd9 + +#define SIGCONTEXT int _code, struct ucontext_t * +#define GET_PC(ctx) ((void *) (ctx)->uc_mcontext.__scratch.__ret) -diff --git a/sysdeps/unix/sysv/linux/arc/sigrestorer.S b/sysdeps/unix/sysv/linux/arc/sigrestorer.S -new file mode 100644 -index 00000000000..573b54e36cf --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sigrestorer.S @@ -0,0 +1,29 @@ @@ -7066,9 +6906,6 @@ index 00000000000..573b54e36cf + ARC_TRAP_INSN + j_s [blink] +PSEUDO_END_NOERRNO (__default_rt_sa_restorer) -diff --git a/sysdeps/unix/sysv/linux/arc/swapcontext.S b/sysdeps/unix/sysv/linux/arc/swapcontext.S -new file mode 100644 -index 00000000000..853d3805de6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/swapcontext.S @@ -0,0 +1,92 @@ @@ -7164,9 +7001,6 @@ index 00000000000..853d3805de6 + +PSEUDO_END (__swapcontext) +weak_alias (__swapcontext, swapcontext) -diff --git a/sysdeps/unix/sysv/linux/arc/sys/cachectl.h b/sysdeps/unix/sysv/linux/arc/sys/cachectl.h -new file mode 100644 -index 00000000000..2d93e49e6a9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sys/cachectl.h @@ -0,0 +1,36 @@ @@ -7206,9 +7040,6 @@ index 00000000000..2d93e49e6a9 +__END_DECLS + +#endif /* sys/cachectl.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/sys/ucontext.h b/sysdeps/unix/sysv/linux/arc/sys/ucontext.h -new file mode 100644 -index 00000000000..7e357bcd65e --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sys/ucontext.h @@ -0,0 +1,63 @@ @@ -7275,9 +7106,6 @@ index 00000000000..7e357bcd65e +#undef __ctx + +#endif /* sys/ucontext.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/sys/user.h b/sysdeps/unix/sysv/linux/arc/sys/user.h -new file mode 100644 -index 00000000000..50d0dc7827a --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sys/user.h @@ -0,0 +1,31 @@ @@ -7312,9 +7140,6 @@ index 00000000000..50d0dc7827a +}; + +#endif /* sys/user.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S -new file mode 100644 -index 00000000000..3fe5fcdd041 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/syscall.S @@ -0,0 +1,38 @@ @@ -7356,18 +7181,12 @@ index 00000000000..3fe5fcdd041 + brhi r0, -1024, .Lcall_syscall_err + j [blink] +PSEUDO_END (syscall) -diff --git a/sysdeps/unix/sysv/linux/arc/syscalls.list b/sysdeps/unix/sysv/linux/arc/syscalls.list -new file mode 100644 -index 00000000000..d0ef5977ee0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/syscalls.list @@ -0,0 +1,3 @@ +# File name Caller Syscall name Args Strong name Weak names + +cacheflush - cacheflush i:pii _flush_cache cacheflush -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.c b/sysdeps/unix/sysv/linux/arc/sysdep.c -new file mode 100644 -index 00000000000..5618f378515 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sysdep.c @@ -0,0 +1,33 @@ @@ -7404,9 +7223,6 @@ index 00000000000..5618f378515 +#if IS_IN (libc) +hidden_def (__syscall_error) +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h -new file mode 100644 -index 00000000000..9ad95d97ae1 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sysdep.h @@ -0,0 +1,251 @@ @@ -7661,9 +7477,6 @@ index 00000000000..9ad95d97ae1 +#endif /* !__ASSEMBLER__ */ + +#endif /* linux/arc/sysdep.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/ucontext-macros.h b/sysdeps/unix/sysv/linux/arc/ucontext-macros.h -new file mode 100644 -index 00000000000..ed261399c98 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ucontext-macros.h @@ -0,0 +1,29 @@ @@ -7696,9 +7509,6 @@ index 00000000000..ed261399c98 +#define LOAD_REG(reg, rbase, off) ld reg, [rbase, UCONTEXT_MCONTEXT + off * 4] + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/ucontext_i.sym b/sysdeps/unix/sysv/linux/arc/ucontext_i.sym -new file mode 100644 -index 00000000000..d84e92f9f54 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ucontext_i.sym @@ -0,0 +1,20 @@ @@ -7722,9 +7532,6 @@ index 00000000000..d84e92f9f54 +UCONTEXT_MCONTEXT ucontext (uc_mcontext) +UCONTEXT_SIGMASK ucontext (uc_sigmask) +UCONTEXT_SIZE sizeof (ucontext_t) -diff --git a/sysdeps/unix/sysv/linux/arc/vfork.S b/sysdeps/unix/sysv/linux/arc/vfork.S -new file mode 100644 -index 00000000000..7f981d0681c --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/vfork.S @@ -0,0 +1,42 @@ @@ -7770,11 +7577,9 @@ index 00000000000..7f981d0681c +libc_hidden_def (__vfork) + +weak_alias (__vfork, vfork) -diff --git a/sysdeps/unix/sysv/linux/syscall-names.list b/sysdeps/unix/sysv/linux/syscall-names.list -index b650dc07cc6..5a9f63ff511 100644 --- a/sysdeps/unix/sysv/linux/syscall-names.list +++ b/sysdeps/unix/sysv/linux/syscall-names.list -@@ -42,6 +42,9 @@ adjtimex +@@ -42,6 +42,9 @@ afs_syscall alarm alloc_hugepages @@ -7784,11 +7589,9 @@ index b650dc07cc6..5a9f63ff511 100644 arch_prctl arm_fadvise64_64 arm_sync_file_range -diff --git a/timezone/zic.c b/timezone/zic.c -index 2ebc66a9af5..8e8d94fac3a 100644 --- a/timezone/zic.c +++ b/timezone/zic.c -@@ -39,7 +39,7 @@ typedef int_fast64_t zic_t; +@@ -39,7 +39,7 @@ #include #endif #ifdef S_IRUSR diff --git a/packages/glibc/2.29/0002-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch b/packages/glibc/2.29/0002-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch index e188dd0..5e3b87f 100644 --- a/packages/glibc/2.29/0002-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch +++ b/packages/glibc/2.29/0002-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch @@ -10,16 +10,13 @@ references to _dl_cet_check and _dl_open_check. (cherry picked from commit 9fb8139079ef0bb1aa33a4ae418cbb113b9b9da7) --- - NEWS | 1 + - configure | 23 ++++++++++++++++++++++- - configure.ac | 9 ++++++++- - 3 files changed, 31 insertions(+), 2 deletions(-) + configure | 23 ++++++++++++++++++++++- + configure.ac | 9 ++++++++- + 2 files changed, 30 insertions(+), 2 deletions(-) -diff --git a/configure b/configure -index 101dfddf37..6a2df7c2be 100755 --- a/configure +++ b/configure -@@ -3777,11 +3777,32 @@ else +@@ -3777,11 +3777,32 @@ fi @@ -53,11 +50,9 @@ index 101dfddf37..6a2df7c2be 100755 fi -diff --git a/configure.ac b/configure.ac -index 46a74687a6..f483afdc2e 100644 --- a/configure.ac +++ b/configure.ac -@@ -472,11 +472,18 @@ AC_ARG_ENABLE([mathvec], +@@ -472,11 +472,18 @@ [build_mathvec=$enableval], [build_mathvec=notset]) @@ -77,6 +72,3 @@ index 46a74687a6..f483afdc2e 100644 # We keep the original values in `$config_*' and never modify them, so we # can write them unchanged into config.make. Everything else uses --- -2.20.1 - diff --git a/packages/glibc/2.29/0003-Fix-build-with-GCC-10-when-long-double-double.patch b/packages/glibc/2.29/0003-Fix-build-with-GCC-10-when-long-double-double.patch index ca0d8a7..ef5fa4f 100644 --- a/packages/glibc/2.29/0003-Fix-build-with-GCC-10-when-long-double-double.patch +++ b/packages/glibc/2.29/0003-Fix-build-with-GCC-10-when-long-double-double.patch @@ -25,14 +25,12 @@ irrelevant for other reasons). Tested with build-many-glibcs.py for arm-linux-gnueabi (compilers and glibcs builds), where it fixes the build that previously failed. --- - math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++ + math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) -diff --git a/math/Makefile b/math/Makefile -index 84a8b94c74..0a5a40430e 100644 --- a/math/Makefile +++ b/math/Makefile -@@ -650,6 +650,128 @@ ifneq ($(long-double-fcts),yes) +@@ -657,6 +657,128 @@ # We won't compile the `long double' code at all. Tell the `double' code # to define aliases for the `FUNCl' names. math-CPPFLAGS += -DNO_LONG_DOUBLE @@ -161,6 +159,3 @@ index 84a8b94c74..0a5a40430e 100644 endif # These files quiet sNaNs in a way that is optimized away without --- -2.25.1 - diff --git a/packages/glibc/2.30/0001-Add-ARC-architecture.patch b/packages/glibc/2.30/0001-Add-ARC-architecture.patch index be2ee8a..dce1d20 100644 --- a/packages/glibc/2.30/0001-Add-ARC-architecture.patch +++ b/packages/glibc/2.30/0001-Add-ARC-architecture.patch @@ -9,11 +9,116 @@ git diff glibc-2.30..arc-2.30-2019.09.06 ':!NEWS' ':!ChangeLog' Signed-off-by: Alexey Brodkin --- -diff --git a/elf/elf.h b/elf/elf.h -index 7c6d6094edb..0aa5cb58463 100644 +--- + elf/elf.h | 70 + locale/Makefile | 5 + scripts/build-many-glibcs.py | 4 + stdlib/longlong.h | 6 + support/Makefile | 5 + sysdeps/arc/Implies | 4 + sysdeps/arc/Makefile | 25 + sysdeps/arc/Versions | 6 + sysdeps/arc/__longjmp.S | 50 + sysdeps/arc/abort-instr.h | 2 + sysdeps/arc/atomic-machine.h | 73 + sysdeps/arc/bits/endian.h | 12 + sysdeps/arc/bits/fenv.h | 72 + sysdeps/arc/bits/link.h | 52 + sysdeps/arc/bits/setjmp.h | 26 + sysdeps/arc/bsd-_setjmp.S | 1 + sysdeps/arc/bsd-setjmp.S | 1 + sysdeps/arc/configure | 14 + sysdeps/arc/configure.ac | 11 + sysdeps/arc/dl-machine.h | 340 +++ + sysdeps/arc/dl-runtime.c | 39 + sysdeps/arc/dl-sysdep.h | 25 + sysdeps/arc/dl-tls.h | 30 + sysdeps/arc/dl-trampoline.S | 80 + sysdeps/arc/entry.h | 5 + sysdeps/arc/gccframe.h | 21 + sysdeps/arc/gmp-mparam.h | 23 + sysdeps/arc/jmpbuf-offsets.h | 47 + sysdeps/arc/jmpbuf-unwind.h | 47 + sysdeps/arc/ldsodefs.h | 43 + sysdeps/arc/libc-tls.c | 27 + sysdeps/arc/machine-gmon.h | 35 + sysdeps/arc/memusage.h | 23 + sysdeps/arc/nofpu/Implies | 1 + sysdeps/arc/nofpu/libm-test-ulps | 390 +++ + sysdeps/arc/nofpu/libm-test-ulps-name | 1 + sysdeps/arc/nofpu/math-tests-exceptions.h | 27 + sysdeps/arc/nofpu/math-tests-rounding.h | 27 + sysdeps/arc/nptl/Makefile | 22 + sysdeps/arc/nptl/bits/pthreadtypes-arch.h | 71 + sysdeps/arc/nptl/bits/semaphore.h | 32 + sysdeps/arc/nptl/pthread-offsets.h | 4 + sysdeps/arc/nptl/pthreaddef.h | 32 + sysdeps/arc/nptl/tcb-offsets.sym | 11 + sysdeps/arc/nptl/tls.h | 150 + + sysdeps/arc/preconfigure | 15 + sysdeps/arc/setjmp.S | 66 + sysdeps/arc/sfp-machine.h | 73 + sysdeps/arc/sotruss-lib.c | 51 + sysdeps/arc/stackinfo.h | 33 + sysdeps/arc/start.S | 89 + sysdeps/arc/sysdep.h | 48 + sysdeps/arc/tls-macros.h | 47 + sysdeps/arc/tst-audit.h | 23 + sysdeps/unix/sysv/linux/arc/Implies | 3 + sysdeps/unix/sysv/linux/arc/Makefile | 20 + sysdeps/unix/sysv/linux/arc/Versions | 16 + sysdeps/unix/sysv/linux/arc/bits/procfs.h | 35 + sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h | 12 + sysdeps/unix/sysv/linux/arc/c++-types.data | 67 + sysdeps/unix/sysv/linux/arc/clone.S | 98 + sysdeps/unix/sysv/linux/arc/configure | 4 + sysdeps/unix/sysv/linux/arc/configure.ac | 4 + sysdeps/unix/sysv/linux/arc/dl-static.c | 84 + sysdeps/unix/sysv/linux/arc/getcontext.S | 63 + sysdeps/unix/sysv/linux/arc/ipc_priv.h | 21 + sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h | 6 + sysdeps/unix/sysv/linux/arc/kernel-features.h | 28 + sysdeps/unix/sysv/linux/arc/ld.abilist | 9 + sysdeps/unix/sysv/linux/arc/ldsodefs.h | 32 + sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist | 1 + sysdeps/unix/sysv/linux/arc/libanl.abilist | 4 + sysdeps/unix/sysv/linux/arc/libc.abilist | 2084 ++++++++++++++++++++ + sysdeps/unix/sysv/linux/arc/libcrypt.abilist | 2 + sysdeps/unix/sysv/linux/arc/libdl.abilist | 9 + sysdeps/unix/sysv/linux/arc/libm.abilist | 753 +++++++ + sysdeps/unix/sysv/linux/arc/libpthread.abilist | 240 ++ + sysdeps/unix/sysv/linux/arc/libresolv.abilist | 79 + sysdeps/unix/sysv/linux/arc/librt.abilist | 35 + sysdeps/unix/sysv/linux/arc/libthread_db.abilist | 40 + sysdeps/unix/sysv/linux/arc/libutil.abilist | 6 + sysdeps/unix/sysv/linux/arc/localplt.data | 16 + sysdeps/unix/sysv/linux/arc/makecontext.c | 75 + sysdeps/unix/sysv/linux/arc/mmap_internal.h | 27 + sysdeps/unix/sysv/linux/arc/profil-counter.h | 2 + sysdeps/unix/sysv/linux/arc/pt-vfork.S | 1 + sysdeps/unix/sysv/linux/arc/setcontext.S | 92 + sysdeps/unix/sysv/linux/arc/shlib-versions | 2 + sysdeps/unix/sysv/linux/arc/sigaction.c | 31 + sysdeps/unix/sysv/linux/arc/sigcontextinfo.h | 23 + sysdeps/unix/sysv/linux/arc/sigrestorer.S | 29 + sysdeps/unix/sysv/linux/arc/swapcontext.S | 92 + sysdeps/unix/sysv/linux/arc/sys/cachectl.h | 36 + sysdeps/unix/sysv/linux/arc/sys/ucontext.h | 63 + sysdeps/unix/sysv/linux/arc/sys/user.h | 31 + sysdeps/unix/sysv/linux/arc/syscall.S | 38 + sysdeps/unix/sysv/linux/arc/syscalls.list | 3 + sysdeps/unix/sysv/linux/arc/sysdep.c | 33 + sysdeps/unix/sysv/linux/arc/sysdep.h | 251 ++ + sysdeps/unix/sysv/linux/arc/ucontext-macros.h | 29 + sysdeps/unix/sysv/linux/arc/ucontext_i.sym | 20 + sysdeps/unix/sysv/linux/arc/vfork.S | 42 + sysdeps/unix/sysv/linux/syscall-names.list | 3 + timezone/zic.c | 2 + 104 files changed, 7120 insertions(+), 13 deletions(-) + --- a/elf/elf.h +++ b/elf/elf.h -@@ -330,7 +330,7 @@ typedef struct +@@ -330,7 +330,7 @@ #define EM_CLOUDSHIELD 192 /* CloudShield */ #define EM_COREA_1ST 193 /* KIPO-KAIST Core-A 1st gen. */ #define EM_COREA_2ND 194 /* KIPO-KAIST Core-A 2nd gen. */ @@ -22,7 +127,7 @@ index 7c6d6094edb..0aa5cb58463 100644 #define EM_OPEN8 196 /* Open8 RISC */ #define EM_RL78 197 /* Renesas RL78 */ #define EM_VIDEOCORE5 198 /* Broadcom VideoCore V */ -@@ -4024,6 +4024,74 @@ enum +@@ -4024,6 +4024,74 @@ #define R_NDS32_TLS_TPOFF 102 #define R_NDS32_TLS_DESC 119 @@ -97,11 +202,9 @@ index 7c6d6094edb..0aa5cb58463 100644 __END_DECLS #endif /* elf.h */ -diff --git a/locale/Makefile b/locale/Makefile -index d78cf9b83ac..23fe4bcd8a7 100644 --- a/locale/Makefile +++ b/locale/Makefile -@@ -28,6 +28,7 @@ routines = setlocale findlocale loadlocale loadarchive \ +@@ -28,6 +28,7 @@ localeconv nl_langinfo nl_langinfo_l mb_cur_max \ newlocale duplocale freelocale uselocale tests = tst-C-locale tst-locname tst-duplocale @@ -109,7 +212,7 @@ index d78cf9b83ac..23fe4bcd8a7 100644 categories = ctype messages monetary numeric time paper name \ address telephone measurement identification collate aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ -@@ -62,10 +63,6 @@ lib-modules := charmap-dir simple-hash xmalloc xstrdup \ +@@ -62,10 +63,6 @@ GPERF = gperf GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C @@ -120,11 +223,9 @@ index d78cf9b83ac..23fe4bcd8a7 100644 include ../Rules CFLAGS-md5.c += -I../crypt -diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py -index aa6884e046d..9d3f22e2ccc 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py -@@ -155,6 +155,9 @@ class Context(object): +@@ -155,6 +155,9 @@ 'cfg': ['--disable-multi-arch']}]) self.add_config(arch='aarch64_be', os_name='linux-gnu') @@ -134,7 +235,7 @@ index aa6884e046d..9d3f22e2ccc 100755 self.add_config(arch='alpha', os_name='linux-gnu') self.add_config(arch='arm', -@@ -1259,6 +1262,7 @@ class Config(object): +@@ -1259,6 +1262,7 @@ def install_linux_headers(self, cmdlist): """Install Linux kernel headers.""" arch_map = {'aarch64': 'arm64', @@ -142,11 +243,9 @@ index aa6884e046d..9d3f22e2ccc 100755 'alpha': 'alpha', 'arm': 'arm', 'csky': 'csky', -diff --git a/stdlib/longlong.h b/stdlib/longlong.h -index 3dd8dc3aa80..1f0ce420425 100644 --- a/stdlib/longlong.h +++ b/stdlib/longlong.h -@@ -199,7 +199,8 @@ extern UDItype __udiv_qrnnd (UDItype *, UDItype, UDItype, UDItype); +@@ -199,7 +199,8 @@ : "%r" ((USItype) (ah)), \ "rICal" ((USItype) (bh)), \ "%r" ((USItype) (al)), \ @@ -156,7 +255,7 @@ index 3dd8dc3aa80..1f0ce420425 100644 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ __asm__ ("sub.f %1, %4, %5\n\tsbc %0, %2, %3" \ : "=r" ((USItype) (sh)), \ -@@ -207,7 +208,8 @@ extern UDItype __udiv_qrnnd (UDItype *, UDItype, UDItype, UDItype); +@@ -207,7 +208,8 @@ : "r" ((USItype) (ah)), \ "rICal" ((USItype) (bh)), \ "r" ((USItype) (al)), \ @@ -166,11 +265,9 @@ index 3dd8dc3aa80..1f0ce420425 100644 #define __umulsidi3(u,v) ((UDItype)(USItype)u*(USItype)v) #ifdef __ARC_NORM__ -diff --git a/support/Makefile b/support/Makefile -index ab66913a02d..c64a0a4b907 100644 --- a/support/Makefile +++ b/support/Makefile -@@ -184,12 +184,7 @@ CFLAGS-support_paths.c = \ +@@ -184,12 +184,7 @@ -DSBINDIR_PATH=\"$(sbindir)\" \ -DROOTSBINDIR_PATH=\"$(rootsbindir)\" @@ -183,9 +280,6 @@ index ab66913a02d..c64a0a4b907 100644 ifeq (yes,$(have-selinux)) LDLIBS-$(LINKS_DSO_PROGRAM) += -lselinux -diff --git a/sysdeps/arc/Implies b/sysdeps/arc/Implies -new file mode 100644 -index 00000000000..a0f0b00cfac --- /dev/null +++ b/sysdeps/arc/Implies @@ -0,0 +1,4 @@ @@ -193,9 +287,6 @@ index 00000000000..a0f0b00cfac +wordsize-32 +ieee754/flt-32 +ieee754/dbl-64 -diff --git a/sysdeps/arc/Makefile b/sysdeps/arc/Makefile -new file mode 100644 -index 00000000000..8d2fbe00c5e --- /dev/null +++ b/sysdeps/arc/Makefile @@ -0,0 +1,25 @@ @@ -224,9 +315,6 @@ index 00000000000..8d2fbe00c5e +ifeq ($(subdir),debug) +CFLAGS-backtrace.c += -funwind-tables +endif -diff --git a/sysdeps/arc/Versions b/sysdeps/arc/Versions -new file mode 100644 -index 00000000000..ca0856d2dbd --- /dev/null +++ b/sysdeps/arc/Versions @@ -0,0 +1,6 @@ @@ -236,9 +324,6 @@ index 00000000000..ca0856d2dbd + __mcount; + } +} -diff --git a/sysdeps/arc/__longjmp.S b/sysdeps/arc/__longjmp.S -new file mode 100644 -index 00000000000..8296aa445f6 --- /dev/null +++ b/sysdeps/arc/__longjmp.S @@ -0,0 +1,50 @@ @@ -292,17 +377,11 @@ index 00000000000..8296aa445f6 + mov.z r0, 1 ; can't let setjmp return 0 when it is due to longjmp + +END (__longjmp) -diff --git a/sysdeps/arc/abort-instr.h b/sysdeps/arc/abort-instr.h -new file mode 100644 -index 00000000000..49f33613c40 --- /dev/null +++ b/sysdeps/arc/abort-instr.h @@ -0,0 +1,2 @@ +/* FLAG 1 is privilege mode only instruction, hence will crash any program. */ +#define ABORT_INSTRUCTION asm ("flag 1") -diff --git a/sysdeps/arc/atomic-machine.h b/sysdeps/arc/atomic-machine.h -new file mode 100644 -index 00000000000..bdc91d0558f --- /dev/null +++ b/sysdeps/arc/atomic-machine.h @@ -0,0 +1,73 @@ @@ -379,9 +458,6 @@ index 00000000000..bdc91d0558f +#endif + +#endif /* _ARC_BITS_ATOMIC_H */ -diff --git a/sysdeps/arc/bits/endian.h b/sysdeps/arc/bits/endian.h -new file mode 100644 -index 00000000000..46f41e3cffe --- /dev/null +++ b/sysdeps/arc/bits/endian.h @@ -0,0 +1,12 @@ @@ -397,9 +473,6 @@ index 00000000000..46f41e3cffe +#ifdef __BIG_ENDIAN__ +# error "Big Endian NOt supported on ARC" +#endif -diff --git a/sysdeps/arc/bits/fenv.h b/sysdeps/arc/bits/fenv.h -new file mode 100644 -index 00000000000..58388fb43a3 --- /dev/null +++ b/sysdeps/arc/bits/fenv.h @@ -0,0 +1,72 @@ @@ -475,9 +548,6 @@ index 00000000000..58388fb43a3 +/* Default floating-point control modes. */ +# define FE_DFL_MODE ((const femode_t *) -1L) +#endif -diff --git a/sysdeps/arc/bits/link.h b/sysdeps/arc/bits/link.h -new file mode 100644 -index 00000000000..c4508ab6664 --- /dev/null +++ b/sysdeps/arc/bits/link.h @@ -0,0 +1,52 @@ @@ -533,9 +603,6 @@ index 00000000000..c4508ab6664 + const char *symname); + +__END_DECLS -diff --git a/sysdeps/arc/bits/setjmp.h b/sysdeps/arc/bits/setjmp.h -new file mode 100644 -index 00000000000..3cb457d097c --- /dev/null +++ b/sysdeps/arc/bits/setjmp.h @@ -0,0 +1,26 @@ @@ -565,23 +632,14 @@ index 00000000000..3cb457d097c +typedef long int __jmp_buf[32]; + +#endif -diff --git a/sysdeps/arc/bsd-_setjmp.S b/sysdeps/arc/bsd-_setjmp.S -new file mode 100644 -index 00000000000..90b99cd8c3e --- /dev/null +++ b/sysdeps/arc/bsd-_setjmp.S @@ -0,0 +1 @@ +/* _setjmp is in setjmp.S. */ -diff --git a/sysdeps/arc/bsd-setjmp.S b/sysdeps/arc/bsd-setjmp.S -new file mode 100644 -index 00000000000..d3b823c118b --- /dev/null +++ b/sysdeps/arc/bsd-setjmp.S @@ -0,0 +1 @@ +/* setjmp is in setjmp.S. */ -diff --git a/sysdeps/arc/configure b/sysdeps/arc/configure -new file mode 100644 -index 00000000000..52e286da2eb --- /dev/null +++ b/sysdeps/arc/configure @@ -0,0 +1,14 @@ @@ -599,9 +657,6 @@ index 00000000000..52e286da2eb +cat >>confdefs.h <<_ACEOF +#define ASM_LINE_SEP $libc_cv_asm_line_sep +_ACEOF -diff --git a/sysdeps/arc/configure.ac b/sysdeps/arc/configure.ac -new file mode 100644 -index 00000000000..1074d312f03 --- /dev/null +++ b/sysdeps/arc/configure.ac @@ -0,0 +1,11 @@ @@ -616,9 +671,6 @@ index 00000000000..1074d312f03 +# canonical newline as there's lots of code out there which will break +libc_cv_asm_line_sep='`' +AC_DEFINE_UNQUOTED(ASM_LINE_SEP, $libc_cv_asm_line_sep) -diff --git a/sysdeps/arc/dl-machine.h b/sysdeps/arc/dl-machine.h -new file mode 100644 -index 00000000000..c81acb9d4fd --- /dev/null +++ b/sysdeps/arc/dl-machine.h @@ -0,0 +1,340 @@ @@ -962,9 +1014,6 @@ index 00000000000..c81acb9d4fd +} + +#endif /* RESOLVE_MAP */ -diff --git a/sysdeps/arc/dl-runtime.c b/sysdeps/arc/dl-runtime.c -new file mode 100644 -index 00000000000..48f4a5a7e1d --- /dev/null +++ b/sysdeps/arc/dl-runtime.c @@ -0,0 +1,39 @@ @@ -1007,9 +1056,6 @@ index 00000000000..48f4a5a7e1d +#define reloc_offset reloc_index * sizeof (PLTREL) + +#include -diff --git a/sysdeps/arc/dl-sysdep.h b/sysdeps/arc/dl-sysdep.h -new file mode 100644 -index 00000000000..ffc30b69372 --- /dev/null +++ b/sysdeps/arc/dl-sysdep.h @@ -0,0 +1,25 @@ @@ -1038,9 +1084,6 @@ index 00000000000..ffc30b69372 +#define DL_ARGV_NOT_RELRO 1 + +#define DL_EXTERN_PROTECTED_DATA -diff --git a/sysdeps/arc/dl-tls.h b/sysdeps/arc/dl-tls.h -new file mode 100644 -index 00000000000..7f0cf91e402 --- /dev/null +++ b/sysdeps/arc/dl-tls.h @@ -0,0 +1,30 @@ @@ -1074,9 +1117,6 @@ index 00000000000..7f0cf91e402 + +/* Value used for dtv entries for which the allocation is delayed. */ +#define TLS_DTV_UNALLOCATED ((void *) -1l) -diff --git a/sysdeps/arc/dl-trampoline.S b/sysdeps/arc/dl-trampoline.S -new file mode 100644 -index 00000000000..9da75fb1fe2 --- /dev/null +++ b/sysdeps/arc/dl-trampoline.S @@ -0,0 +1,80 @@ @@ -1160,9 +1200,6 @@ index 00000000000..9da75fb1fe2 + cfi_adjust_cfa_offset (-4) + cfi_restore (r0) +END (_dl_runtime_resolve) -diff --git a/sysdeps/arc/entry.h b/sysdeps/arc/entry.h -new file mode 100644 -index 00000000000..adb01d981af --- /dev/null +++ b/sysdeps/arc/entry.h @@ -0,0 +1,5 @@ @@ -1171,9 +1208,6 @@ index 00000000000..adb01d981af +#endif + +#define ENTRY_POINT __start -diff --git a/sysdeps/arc/gccframe.h b/sysdeps/arc/gccframe.h -new file mode 100644 -index 00000000000..40487fa77b4 --- /dev/null +++ b/sysdeps/arc/gccframe.h @@ -0,0 +1,21 @@ @@ -1198,9 +1232,6 @@ index 00000000000..40487fa77b4 +#define FIRST_PSEUDO_REGISTER 40 + +#include -diff --git a/sysdeps/arc/gmp-mparam.h b/sysdeps/arc/gmp-mparam.h -new file mode 100644 -index 00000000000..e30695fc6b2 --- /dev/null +++ b/sysdeps/arc/gmp-mparam.h @@ -0,0 +1,23 @@ @@ -1227,9 +1258,6 @@ index 00000000000..e30695fc6b2 +#include + +#define IEEE_DOUBLE_BIG_ENDIAN 0 -diff --git a/sysdeps/arc/jmpbuf-offsets.h b/sysdeps/arc/jmpbuf-offsets.h -new file mode 100644 -index 00000000000..9760f3a3891 --- /dev/null +++ b/sysdeps/arc/jmpbuf-offsets.h @@ -0,0 +1,47 @@ @@ -1280,9 +1308,6 @@ index 00000000000..9760f3a3891 + +/* Helper for generic ____longjmp_chk(). */ +#define JB_FRAME_ADDRESS(buf) ((void *) (unsigned long int) (buf[JB_SP])) -diff --git a/sysdeps/arc/jmpbuf-unwind.h b/sysdeps/arc/jmpbuf-unwind.h -new file mode 100644 -index 00000000000..47be5758c75 --- /dev/null +++ b/sysdeps/arc/jmpbuf-unwind.h @@ -0,0 +1,47 @@ @@ -1333,9 +1358,6 @@ index 00000000000..47be5758c75 + +/* We use the normal longjmp for unwinding. */ +#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) -diff --git a/sysdeps/arc/ldsodefs.h b/sysdeps/arc/ldsodefs.h -new file mode 100644 -index 00000000000..53ef4e1e83d --- /dev/null +++ b/sysdeps/arc/ldsodefs.h @@ -0,0 +1,43 @@ @@ -1382,9 +1404,6 @@ index 00000000000..53ef4e1e83d +#include_next + +#endif -diff --git a/sysdeps/arc/libc-tls.c b/sysdeps/arc/libc-tls.c -new file mode 100644 -index 00000000000..903a75a41b5 --- /dev/null +++ b/sysdeps/arc/libc-tls.c @@ -0,0 +1,27 @@ @@ -1415,9 +1434,6 @@ index 00000000000..903a75a41b5 + dtv_t *dtv = THREAD_DTV (); + return (char *) dtv[1].pointer.val + ti->ti_offset; +} -diff --git a/sysdeps/arc/machine-gmon.h b/sysdeps/arc/machine-gmon.h -new file mode 100644 -index 00000000000..1d9e8108d9b --- /dev/null +++ b/sysdeps/arc/machine-gmon.h @@ -0,0 +1,35 @@ @@ -1456,9 +1472,6 @@ index 00000000000..1d9e8108d9b + __mcount_internal ((unsigned long int) frompc, \ + (unsigned long int) __builtin_return_address(0)); \ +} -diff --git a/sysdeps/arc/memusage.h b/sysdeps/arc/memusage.h -new file mode 100644 -index 00000000000..29f234f5bac --- /dev/null +++ b/sysdeps/arc/memusage.h @@ -0,0 +1,23 @@ @@ -1485,16 +1498,10 @@ index 00000000000..29f234f5bac +#define uatomic32_t unsigned int + +#include -diff --git a/sysdeps/arc/nofpu/Implies b/sysdeps/arc/nofpu/Implies -new file mode 100644 -index 00000000000..abcbadb25f2 --- /dev/null +++ b/sysdeps/arc/nofpu/Implies @@ -0,0 +1 @@ +ieee754/soft-fp -diff --git a/sysdeps/arc/nofpu/libm-test-ulps b/sysdeps/arc/nofpu/libm-test-ulps -new file mode 100644 -index 00000000000..0e8ef313fa9 --- /dev/null +++ b/sysdeps/arc/nofpu/libm-test-ulps @@ -0,0 +1,390 @@ @@ -1888,16 +1895,10 @@ index 00000000000..0e8ef313fa9 +ifloat: 3 + +# end of automatic generation -diff --git a/sysdeps/arc/nofpu/libm-test-ulps-name b/sysdeps/arc/nofpu/libm-test-ulps-name -new file mode 100644 -index 00000000000..8c4fba4f9ae --- /dev/null +++ b/sysdeps/arc/nofpu/libm-test-ulps-name @@ -0,0 +1 @@ +ARC -diff --git a/sysdeps/arc/nofpu/math-tests-exceptions.h b/sysdeps/arc/nofpu/math-tests-exceptions.h -new file mode 100644 -index 00000000000..f5c0b73589e --- /dev/null +++ b/sysdeps/arc/nofpu/math-tests-exceptions.h @@ -0,0 +1,27 @@ @@ -1928,9 +1929,6 @@ index 00000000000..f5c0b73589e +#define EXCEPTION_TESTS_long_double 0 + +#endif -diff --git a/sysdeps/arc/nofpu/math-tests-rounding.h b/sysdeps/arc/nofpu/math-tests-rounding.h -new file mode 100644 -index 00000000000..e8f76338b1e --- /dev/null +++ b/sysdeps/arc/nofpu/math-tests-rounding.h @@ -0,0 +1,27 @@ @@ -1961,9 +1959,6 @@ index 00000000000..e8f76338b1e +#define ROUNDING_TESTS_long_double(MODE) ((MODE) == FE_TONEAREST) + +#endif -diff --git a/sysdeps/arc/nptl/Makefile b/sysdeps/arc/nptl/Makefile -new file mode 100644 -index 00000000000..3c33c9cc112 --- /dev/null +++ b/sysdeps/arc/nptl/Makefile @@ -0,0 +1,22 @@ @@ -1989,9 +1984,6 @@ index 00000000000..3c33c9cc112 +ifeq ($(subdir),csu) +gen-as-const-headers += tcb-offsets.sym +endif -diff --git a/sysdeps/arc/nptl/bits/pthreadtypes-arch.h b/sysdeps/arc/nptl/bits/pthreadtypes-arch.h -new file mode 100644 -index 00000000000..eae884f61cf --- /dev/null +++ b/sysdeps/arc/nptl/bits/pthreadtypes-arch.h @@ -0,0 +1,71 @@ @@ -2066,9 +2058,6 @@ index 00000000000..eae884f61cf +#define __PTHREAD_RWLOCK_ELISION_EXTRA 0 + +#endif /* bits/pthreadtypes-arch.h */ -diff --git a/sysdeps/arc/nptl/bits/semaphore.h b/sysdeps/arc/nptl/bits/semaphore.h -new file mode 100644 -index 00000000000..662d08401d0 --- /dev/null +++ b/sysdeps/arc/nptl/bits/semaphore.h @@ -0,0 +1,32 @@ @@ -2104,9 +2093,6 @@ index 00000000000..662d08401d0 + char __size[__SIZEOF_SEM_T]; + long int __align; +} sem_t; -diff --git a/sysdeps/arc/nptl/pthread-offsets.h b/sysdeps/arc/nptl/pthread-offsets.h -new file mode 100644 -index 00000000000..c363e8cda8d --- /dev/null +++ b/sysdeps/arc/nptl/pthread-offsets.h @@ -0,0 +1,4 @@ @@ -2114,9 +2100,6 @@ index 00000000000..c363e8cda8d +#define __PTHREAD_MUTEX_KIND_OFFSET 16 +#define __PTHREAD_MUTEX_SPINS_OFFSET 20 +#define __PTHREAD_MUTEX_LIST_OFFSET 24 -diff --git a/sysdeps/arc/nptl/pthreaddef.h b/sysdeps/arc/nptl/pthreaddef.h -new file mode 100644 -index 00000000000..80a109bbd52 --- /dev/null +++ b/sysdeps/arc/nptl/pthreaddef.h @@ -0,0 +1,32 @@ @@ -2152,9 +2135,6 @@ index 00000000000..80a109bbd52 + +/* Location of current stack frame. */ +#define CURRENT_STACK_FRAME __builtin_frame_address (0) -diff --git a/sysdeps/arc/nptl/tcb-offsets.sym b/sysdeps/arc/nptl/tcb-offsets.sym -new file mode 100644 -index 00000000000..56950e0676e --- /dev/null +++ b/sysdeps/arc/nptl/tcb-offsets.sym @@ -0,0 +1,11 @@ @@ -2169,9 +2149,6 @@ index 00000000000..56950e0676e +TLS_TCB_SIZE sizeof(tcbhead_t) + +PTHREAD_TID offsetof(struct pthread, tid) -diff --git a/sysdeps/arc/nptl/tls.h b/sysdeps/arc/nptl/tls.h -new file mode 100644 -index 00000000000..2c90109d570 --- /dev/null +++ b/sysdeps/arc/nptl/tls.h @@ -0,0 +1,150 @@ @@ -2325,9 +2302,6 @@ index 00000000000..2c90109d570 +#endif /* __ASSEMBLER__ */ + +#endif /* tls.h */ -diff --git a/sysdeps/arc/preconfigure b/sysdeps/arc/preconfigure -new file mode 100644 -index 00000000000..d9c5429f405 --- /dev/null +++ b/sysdeps/arc/preconfigure @@ -0,0 +1,15 @@ @@ -2346,9 +2320,6 @@ index 00000000000..d9c5429f405 + ;; + +esac -diff --git a/sysdeps/arc/setjmp.S b/sysdeps/arc/setjmp.S -new file mode 100644 -index 00000000000..518545a99e8 --- /dev/null +++ b/sysdeps/arc/setjmp.S @@ -0,0 +1,66 @@ @@ -2418,9 +2389,6 @@ index 00000000000..518545a99e8 +END (__sigsetjmp) + +libc_hidden_def (__sigsetjmp) -diff --git a/sysdeps/arc/sfp-machine.h b/sysdeps/arc/sfp-machine.h -new file mode 100644 -index 00000000000..5ceaf56a988 --- /dev/null +++ b/sysdeps/arc/sfp-machine.h @@ -0,0 +1,73 @@ @@ -2497,9 +2465,6 @@ index 00000000000..5ceaf56a988 + } while (0) + +#define _FP_TININESS_AFTER_ROUNDING 0 -diff --git a/sysdeps/arc/sotruss-lib.c b/sysdeps/arc/sotruss-lib.c -new file mode 100644 -index 00000000000..ffbb5bbd6d0 --- /dev/null +++ b/sysdeps/arc/sotruss-lib.c @@ -0,0 +1,51 @@ @@ -2554,9 +2519,6 @@ index 00000000000..ffbb5bbd6d0 + + return 0; +} -diff --git a/sysdeps/arc/stackinfo.h b/sysdeps/arc/stackinfo.h -new file mode 100644 -index 00000000000..fe69161382a --- /dev/null +++ b/sysdeps/arc/stackinfo.h @@ -0,0 +1,33 @@ @@ -2593,9 +2555,6 @@ index 00000000000..fe69161382a +#define DEFAULT_STACK_PERMS (PF_R|PF_W) + +#endif /* stackinfo.h */ -diff --git a/sysdeps/arc/start.S b/sysdeps/arc/start.S -new file mode 100644 -index 00000000000..4ade1e871f6 --- /dev/null +++ b/sysdeps/arc/start.S @@ -0,0 +1,89 @@ @@ -2688,9 +2647,6 @@ index 00000000000..4ade1e871f6 + .long 0 + .weak data_start + data_start = __data_start -diff --git a/sysdeps/arc/sysdep.h b/sysdeps/arc/sysdep.h -new file mode 100644 -index 00000000000..127e9b01e73 --- /dev/null +++ b/sysdeps/arc/sysdep.h @@ -0,0 +1,48 @@ @@ -2742,9 +2698,6 @@ index 00000000000..127e9b01e73 +# define CALL_MCOUNT /* Do nothing for now. */ + +#endif /* __ASSEMBLER__ */ -diff --git a/sysdeps/arc/tls-macros.h b/sysdeps/arc/tls-macros.h -new file mode 100644 -index 00000000000..4d54683eda4 --- /dev/null +++ b/sysdeps/arc/tls-macros.h @@ -0,0 +1,47 @@ @@ -2795,9 +2748,6 @@ index 00000000000..4d54683eda4 + "add %0, %1, %0 \n" \ + : "=&r" (__result) : "r" (tp)); \ + __result; }) -diff --git a/sysdeps/arc/tst-audit.h b/sysdeps/arc/tst-audit.h -new file mode 100644 -index 00000000000..9237ad2440c --- /dev/null +++ b/sysdeps/arc/tst-audit.h @@ -0,0 +1,23 @@ @@ -2824,18 +2774,12 @@ index 00000000000..9237ad2440c +#define La_regs La_arc_regs +#define La_retval La_arc_retval +#define int_retval lrv_reg[0] -diff --git a/sysdeps/unix/sysv/linux/arc/Implies b/sysdeps/unix/sysv/linux/arc/Implies -new file mode 100644 -index 00000000000..7f739a0340b --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/Implies @@ -0,0 +1,3 @@ +arc/nptl +unix/sysv/linux/generic/wordsize-32 +unix/sysv/linux/generic -diff --git a/sysdeps/unix/sysv/linux/arc/Makefile b/sysdeps/unix/sysv/linux/arc/Makefile -new file mode 100644 -index 00000000000..a6c6dfc6ec6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/Makefile @@ -0,0 +1,20 @@ @@ -2859,9 +2803,6 @@ index 00000000000..a6c6dfc6ec6 +sysdep-dl-routines += dl-static +endif +endif -diff --git a/sysdeps/unix/sysv/linux/arc/Versions b/sysdeps/unix/sysv/linux/arc/Versions -new file mode 100644 -index 00000000000..3eedf26ae23 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/Versions @@ -0,0 +1,16 @@ @@ -2881,9 +2822,6 @@ index 00000000000..3eedf26ae23 + __default_rt_sa_restorer; + } +} -diff --git a/sysdeps/unix/sysv/linux/arc/bits/procfs.h b/sysdeps/unix/sysv/linux/arc/bits/procfs.h -new file mode 100644 -index 00000000000..b37deaee587 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/bits/procfs.h @@ -0,0 +1,35 @@ @@ -2922,9 +2860,6 @@ index 00000000000..b37deaee587 + +/* There's no seperate floating point reg file in ARCv2. */ +typedef struct { } elf_fpregset_t; -diff --git a/sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h b/sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h -new file mode 100644 -index 00000000000..795638a30bd --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h @@ -0,0 +1,12 @@ @@ -2940,9 +2875,6 @@ index 00000000000..795638a30bd +} __sigset_t; + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/c++-types.data b/sysdeps/unix/sysv/linux/arc/c++-types.data -new file mode 100644 -index 00000000000..303f4570c8e --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/c++-types.data @@ -0,0 +1,67 @@ @@ -3013,9 +2945,6 @@ index 00000000000..303f4570c8e +useconds_t:j +ushort:t +u_short:t -diff --git a/sysdeps/unix/sysv/linux/arc/clone.S b/sysdeps/unix/sysv/linux/arc/clone.S -new file mode 100644 -index 00000000000..55c2a2b60ed --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/clone.S @@ -0,0 +1,98 @@ @@ -3117,9 +3046,6 @@ index 00000000000..55c2a2b60ed +PSEUDO_END (__clone) +libc_hidden_def (__clone) +weak_alias (__clone, clone) -diff --git a/sysdeps/unix/sysv/linux/arc/configure b/sysdeps/unix/sysv/linux/arc/configure -new file mode 100644 -index 00000000000..f74fa7cb025 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/configure @@ -0,0 +1,4 @@ @@ -3127,9 +3053,6 @@ index 00000000000..f74fa7cb025 + # Local configure fragment for sysdeps/unix/sysv/linux/arc. + +arch_minimum_kernel=3.9.0 -diff --git a/sysdeps/unix/sysv/linux/arc/configure.ac b/sysdeps/unix/sysv/linux/arc/configure.ac -new file mode 100644 -index 00000000000..a9528032d32 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/configure.ac @@ -0,0 +1,4 @@ @@ -3137,9 +3060,6 @@ index 00000000000..a9528032d32 +# Local configure fragment for sysdeps/unix/sysv/linux/arc. + +arch_minimum_kernel=3.9.0 -diff --git a/sysdeps/unix/sysv/linux/arc/dl-static.c b/sysdeps/unix/sysv/linux/arc/dl-static.c -new file mode 100644 -index 00000000000..1a8757c9840 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/dl-static.c @@ -0,0 +1,84 @@ @@ -3227,9 +3147,6 @@ index 00000000000..1a8757c9840 +} + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/getcontext.S b/sysdeps/unix/sysv/linux/arc/getcontext.S -new file mode 100644 -index 00000000000..723cc237d87 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/getcontext.S @@ -0,0 +1,63 @@ @@ -3296,9 +3213,6 @@ index 00000000000..723cc237d87 + +PSEUDO_END (__getcontext) +weak_alias (__getcontext, getcontext) -diff --git a/sysdeps/unix/sysv/linux/arc/ipc_priv.h b/sysdeps/unix/sysv/linux/arc/ipc_priv.h -new file mode 100644 -index 00000000000..309eb3064e9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ipc_priv.h @@ -0,0 +1,21 @@ @@ -3323,9 +3237,6 @@ index 00000000000..309eb3064e9 +#include /* For __key_t */ + +#define __IPC_64 0x0 -diff --git a/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h -new file mode 100644 -index 00000000000..6c129398483 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h @@ -0,0 +1,6 @@ @@ -3335,9 +3246,6 @@ index 00000000000..6c129398483 +#define SIGJMP_BUF_ALIGN __alignof__ (unsigned long int) +#define MASK_WAS_SAVED_OFFSET (32 * sizeof (unsigned long int)) +#define SAVED_MASK_OFFSET (33 * sizeof (unsigned long int)) -diff --git a/sysdeps/unix/sysv/linux/arc/kernel-features.h b/sysdeps/unix/sysv/linux/arc/kernel-features.h -new file mode 100644 -index 00000000000..00255337bc8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/kernel-features.h @@ -0,0 +1,28 @@ @@ -3369,9 +3277,6 @@ index 00000000000..00255337bc8 + +#undef __ASSUME_CLONE_DEFAULT +#define __ASSUME_CLONE_BACKWARDS 1 -diff --git a/sysdeps/unix/sysv/linux/arc/ld.abilist b/sysdeps/unix/sysv/linux/arc/ld.abilist -new file mode 100644 -index 00000000000..41183d7beed --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ld.abilist @@ -0,0 +1,9 @@ @@ -3384,9 +3289,6 @@ index 00000000000..41183d7beed +GLIBC_2.30 free F +GLIBC_2.30 malloc F +GLIBC_2.30 realloc F -diff --git a/sysdeps/unix/sysv/linux/arc/ldsodefs.h b/sysdeps/unix/sysv/linux/arc/ldsodefs.h -new file mode 100644 -index 00000000000..8c5c6800af1 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ldsodefs.h @@ -0,0 +1,32 @@ @@ -3422,16 +3324,10 @@ index 00000000000..8c5c6800af1 +#define DL_STATIC_INIT(map) _dl_static_init (map) + +#endif /* ldsodefs.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist -new file mode 100644 -index 00000000000..c6253c0ae8a --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist @@ -0,0 +1 @@ +GLIBC_2.30 __ctype_get_mb_cur_max F -diff --git a/sysdeps/unix/sysv/linux/arc/libanl.abilist b/sysdeps/unix/sysv/linux/arc/libanl.abilist -new file mode 100644 -index 00000000000..d3b753219ee --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libanl.abilist @@ -0,0 +1,4 @@ @@ -3439,9 +3335,6 @@ index 00000000000..d3b753219ee +GLIBC_2.30 gai_error F +GLIBC_2.30 gai_suspend F +GLIBC_2.30 getaddrinfo_a F -diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist -new file mode 100644 -index 00000000000..823ae25bccf --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -0,0 +1,2084 @@ @@ -5529,17 +5422,11 @@ index 00000000000..823ae25bccf +GLIBC_2.30 xencrypt F +GLIBC_2.30 xprt_register F +GLIBC_2.30 xprt_unregister F -diff --git a/sysdeps/unix/sysv/linux/arc/libcrypt.abilist b/sysdeps/unix/sysv/linux/arc/libcrypt.abilist -new file mode 100644 -index 00000000000..8d83578d8cf --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libcrypt.abilist @@ -0,0 +1,2 @@ +GLIBC_2.30 crypt F +GLIBC_2.30 crypt_r F -diff --git a/sysdeps/unix/sysv/linux/arc/libdl.abilist b/sysdeps/unix/sysv/linux/arc/libdl.abilist -new file mode 100644 -index 00000000000..3fc6d95b85b --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libdl.abilist @@ -0,0 +1,9 @@ @@ -5552,9 +5439,6 @@ index 00000000000..3fc6d95b85b +GLIBC_2.30 dlopen F +GLIBC_2.30 dlsym F +GLIBC_2.30 dlvsym F -diff --git a/sysdeps/unix/sysv/linux/arc/libm.abilist b/sysdeps/unix/sysv/linux/arc/libm.abilist -new file mode 100644 -index 00000000000..43f3a97e6f2 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libm.abilist @@ -0,0 +1,753 @@ @@ -6311,9 +6195,6 @@ index 00000000000..43f3a97e6f2 +GLIBC_2.30 ynf32x F +GLIBC_2.30 ynf64 F +GLIBC_2.30 ynl F -diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist -new file mode 100644 -index 00000000000..d89cf8d3014 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -0,0 +1,240 @@ @@ -6557,9 +6438,6 @@ index 00000000000..d89cf8d3014 +GLIBC_2.30 wait F +GLIBC_2.30 waitpid F +GLIBC_2.30 write F -diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist -new file mode 100644 -index 00000000000..ca745f5b987 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist @@ -0,0 +1,79 @@ @@ -6642,9 +6520,6 @@ index 00000000000..ca745f5b987 +GLIBC_2.30 ns_sprintrr F +GLIBC_2.30 ns_sprintrrf F +GLIBC_2.30 ns_subdomain F -diff --git a/sysdeps/unix/sysv/linux/arc/librt.abilist b/sysdeps/unix/sysv/linux/arc/librt.abilist -new file mode 100644 -index 00000000000..8d39a086966 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/librt.abilist @@ -0,0 +1,35 @@ @@ -6683,9 +6558,6 @@ index 00000000000..8d39a086966 +GLIBC_2.30 timer_getoverrun F +GLIBC_2.30 timer_gettime F +GLIBC_2.30 timer_settime F -diff --git a/sysdeps/unix/sysv/linux/arc/libthread_db.abilist b/sysdeps/unix/sysv/linux/arc/libthread_db.abilist -new file mode 100644 -index 00000000000..94220c95927 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libthread_db.abilist @@ -0,0 +1,40 @@ @@ -6729,9 +6601,6 @@ index 00000000000..94220c95927 +GLIBC_2.30 td_thr_tlsbase F +GLIBC_2.30 td_thr_tsd F +GLIBC_2.30 td_thr_validate F -diff --git a/sysdeps/unix/sysv/linux/arc/libutil.abilist b/sysdeps/unix/sysv/linux/arc/libutil.abilist -new file mode 100644 -index 00000000000..f745157afa3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libutil.abilist @@ -0,0 +1,6 @@ @@ -6741,9 +6610,6 @@ index 00000000000..f745157afa3 +GLIBC_2.30 logout F +GLIBC_2.30 logwtmp F +GLIBC_2.30 openpty F -diff --git a/sysdeps/unix/sysv/linux/arc/localplt.data b/sysdeps/unix/sysv/linux/arc/localplt.data -new file mode 100644 -index 00000000000..e902fd0607a --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/localplt.data @@ -0,0 +1,16 @@ @@ -6763,9 +6629,6 @@ index 00000000000..e902fd0607a +ld.so: _dl_catch_error +ld.so: _dl_signal_exception +ld.so: _dl_catch_exception -diff --git a/sysdeps/unix/sysv/linux/arc/makecontext.c b/sysdeps/unix/sysv/linux/arc/makecontext.c -new file mode 100644 -index 00000000000..3d46452e175 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/makecontext.c @@ -0,0 +1,75 @@ @@ -6844,9 +6707,6 @@ index 00000000000..3d46452e175 +} + +weak_alias (__makecontext, makecontext) -diff --git a/sysdeps/unix/sysv/linux/arc/mmap_internal.h b/sysdeps/unix/sysv/linux/arc/mmap_internal.h -new file mode 100644 -index 00000000000..51d0a25f26b --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/mmap_internal.h @@ -0,0 +1,27 @@ @@ -6877,24 +6737,15 @@ index 00000000000..51d0a25f26b +#include_next + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/profil-counter.h b/sysdeps/unix/sysv/linux/arc/profil-counter.h -new file mode 100644 -index 00000000000..8a6a0bcf3d5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/profil-counter.h @@ -0,0 +1,2 @@ +/* We can use the ix86 version. */ +#include -diff --git a/sysdeps/unix/sysv/linux/arc/pt-vfork.S b/sysdeps/unix/sysv/linux/arc/pt-vfork.S -new file mode 100644 -index 00000000000..1cc89317007 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/pt-vfork.S @@ -0,0 +1 @@ +/* Not needed. */ -diff --git a/sysdeps/unix/sysv/linux/arc/setcontext.S b/sysdeps/unix/sysv/linux/arc/setcontext.S -new file mode 100644 -index 00000000000..8cf4ffcaf5a --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/setcontext.S @@ -0,0 +1,92 @@ @@ -6990,17 +6841,11 @@ index 00000000000..8cf4ffcaf5a + /* Exit with status 0. */ + b HIDDEN_JUMPTARGET(exit) +END (__startcontext) -diff --git a/sysdeps/unix/sysv/linux/arc/shlib-versions b/sysdeps/unix/sysv/linux/arc/shlib-versions -new file mode 100644 -index 00000000000..cbe457b9dbe --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/shlib-versions @@ -0,0 +1,2 @@ +DEFAULT GLIBC_2.30 +ld=ld-linux-arc.so.2 -diff --git a/sysdeps/unix/sysv/linux/arc/sigaction.c b/sysdeps/unix/sysv/linux/arc/sigaction.c -new file mode 100644 -index 00000000000..db7293865f3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sigaction.c @@ -0,0 +1,31 @@ @@ -7035,9 +6880,6 @@ index 00000000000..db7293865f3 +#define RESET_SA_RESTORER(act, kact) + +#include -diff --git a/sysdeps/unix/sysv/linux/arc/sigcontextinfo.h b/sysdeps/unix/sysv/linux/arc/sigcontextinfo.h -new file mode 100644 -index 00000000000..acf03c6afd9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sigcontextinfo.h @@ -0,0 +1,23 @@ @@ -7064,9 +6906,6 @@ index 00000000000..acf03c6afd9 + +#define SIGCONTEXT int _code, struct ucontext_t * +#define GET_PC(ctx) ((void *) (ctx)->uc_mcontext.__scratch.__ret) -diff --git a/sysdeps/unix/sysv/linux/arc/sigrestorer.S b/sysdeps/unix/sysv/linux/arc/sigrestorer.S -new file mode 100644 -index 00000000000..573b54e36cf --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sigrestorer.S @@ -0,0 +1,29 @@ @@ -7099,9 +6938,6 @@ index 00000000000..573b54e36cf + ARC_TRAP_INSN + j_s [blink] +PSEUDO_END_NOERRNO (__default_rt_sa_restorer) -diff --git a/sysdeps/unix/sysv/linux/arc/swapcontext.S b/sysdeps/unix/sysv/linux/arc/swapcontext.S -new file mode 100644 -index 00000000000..853d3805de6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/swapcontext.S @@ -0,0 +1,92 @@ @@ -7197,9 +7033,6 @@ index 00000000000..853d3805de6 + +PSEUDO_END (__swapcontext) +weak_alias (__swapcontext, swapcontext) -diff --git a/sysdeps/unix/sysv/linux/arc/sys/cachectl.h b/sysdeps/unix/sysv/linux/arc/sys/cachectl.h -new file mode 100644 -index 00000000000..2d93e49e6a9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sys/cachectl.h @@ -0,0 +1,36 @@ @@ -7239,9 +7072,6 @@ index 00000000000..2d93e49e6a9 +__END_DECLS + +#endif /* sys/cachectl.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/sys/ucontext.h b/sysdeps/unix/sysv/linux/arc/sys/ucontext.h -new file mode 100644 -index 00000000000..7e357bcd65e --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sys/ucontext.h @@ -0,0 +1,63 @@ @@ -7308,9 +7138,6 @@ index 00000000000..7e357bcd65e +#undef __ctx + +#endif /* sys/ucontext.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/sys/user.h b/sysdeps/unix/sysv/linux/arc/sys/user.h -new file mode 100644 -index 00000000000..50d0dc7827a --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sys/user.h @@ -0,0 +1,31 @@ @@ -7345,9 +7172,6 @@ index 00000000000..50d0dc7827a +}; + +#endif /* sys/user.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S -new file mode 100644 -index 00000000000..3fe5fcdd041 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/syscall.S @@ -0,0 +1,38 @@ @@ -7389,18 +7213,12 @@ index 00000000000..3fe5fcdd041 + brhi r0, -1024, .Lcall_syscall_err + j [blink] +PSEUDO_END (syscall) -diff --git a/sysdeps/unix/sysv/linux/arc/syscalls.list b/sysdeps/unix/sysv/linux/arc/syscalls.list -new file mode 100644 -index 00000000000..d0ef5977ee0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/syscalls.list @@ -0,0 +1,3 @@ +# File name Caller Syscall name Args Strong name Weak names + +cacheflush - cacheflush i:pii _flush_cache cacheflush -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.c b/sysdeps/unix/sysv/linux/arc/sysdep.c -new file mode 100644 -index 00000000000..5618f378515 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sysdep.c @@ -0,0 +1,33 @@ @@ -7437,9 +7255,6 @@ index 00000000000..5618f378515 +#if IS_IN (libc) +hidden_def (__syscall_error) +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h -new file mode 100644 -index 00000000000..9ad95d97ae1 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sysdep.h @@ -0,0 +1,251 @@ @@ -7694,9 +7509,6 @@ index 00000000000..9ad95d97ae1 +#endif /* !__ASSEMBLER__ */ + +#endif /* linux/arc/sysdep.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/ucontext-macros.h b/sysdeps/unix/sysv/linux/arc/ucontext-macros.h -new file mode 100644 -index 00000000000..ed261399c98 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ucontext-macros.h @@ -0,0 +1,29 @@ @@ -7729,9 +7541,6 @@ index 00000000000..ed261399c98 +#define LOAD_REG(reg, rbase, off) ld reg, [rbase, UCONTEXT_MCONTEXT + off * 4] + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/ucontext_i.sym b/sysdeps/unix/sysv/linux/arc/ucontext_i.sym -new file mode 100644 -index 00000000000..d84e92f9f54 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ucontext_i.sym @@ -0,0 +1,20 @@ @@ -7755,9 +7564,6 @@ index 00000000000..d84e92f9f54 +UCONTEXT_MCONTEXT ucontext (uc_mcontext) +UCONTEXT_SIGMASK ucontext (uc_sigmask) +UCONTEXT_SIZE sizeof (ucontext_t) -diff --git a/sysdeps/unix/sysv/linux/arc/vfork.S b/sysdeps/unix/sysv/linux/arc/vfork.S -new file mode 100644 -index 00000000000..7f981d0681c --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/vfork.S @@ -0,0 +1,42 @@ @@ -7803,11 +7609,9 @@ index 00000000000..7f981d0681c +libc_hidden_def (__vfork) + +weak_alias (__vfork, vfork) -diff --git a/sysdeps/unix/sysv/linux/syscall-names.list b/sysdeps/unix/sysv/linux/syscall-names.list -index 21bf37c6274..1b12c8844a1 100644 --- a/sysdeps/unix/sysv/linux/syscall-names.list +++ b/sysdeps/unix/sysv/linux/syscall-names.list -@@ -42,6 +42,9 @@ adjtimex +@@ -42,6 +42,9 @@ afs_syscall alarm alloc_hugepages @@ -7817,11 +7621,9 @@ index 21bf37c6274..1b12c8844a1 100644 arch_prctl arm_fadvise64_64 arm_sync_file_range -diff --git a/timezone/zic.c b/timezone/zic.c -index 2ebc66a9af5..8e8d94fac3a 100644 --- a/timezone/zic.c +++ b/timezone/zic.c -@@ -39,7 +39,7 @@ typedef int_fast64_t zic_t; +@@ -39,7 +39,7 @@ #include #endif #ifdef S_IRUSR diff --git a/packages/glibc/2.30/0002-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch b/packages/glibc/2.30/0002-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch index 6f5dbc3..5941886 100644 --- a/packages/glibc/2.30/0002-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch +++ b/packages/glibc/2.30/0002-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch @@ -8,16 +8,13 @@ is defined, yet CET functionality is not compiled and linked into the dynamic loader, resulting in a linker failure due to undefined references to _dl_cet_check and _dl_open_check. --- - NEWS | 1 + - configure | 23 ++++++++++++++++++++++- - configure.ac | 9 ++++++++- - 3 files changed, 31 insertions(+), 2 deletions(-) + configure | 23 ++++++++++++++++++++++- + configure.ac | 9 ++++++++- + 2 files changed, 30 insertions(+), 2 deletions(-) -diff --git a/configure b/configure -index c773c487b5..6d26b8246f 100755 --- a/configure +++ b/configure -@@ -3777,11 +3777,32 @@ else +@@ -3777,11 +3777,32 @@ fi @@ -51,11 +48,9 @@ index c773c487b5..6d26b8246f 100755 fi -diff --git a/configure.ac b/configure.ac -index 598ba6c4ae..7436485419 100644 --- a/configure.ac +++ b/configure.ac -@@ -472,11 +472,18 @@ AC_ARG_ENABLE([mathvec], +@@ -472,11 +472,18 @@ [build_mathvec=$enableval], [build_mathvec=notset]) @@ -75,6 +70,3 @@ index 598ba6c4ae..7436485419 100644 # We keep the original values in `$config_*' and never modify them, so we # can write them unchanged into config.make. Everything else uses --- -2.20.1 - diff --git a/packages/glibc/2.30/0003-Fix-build-with-GCC-10-when-long-double-double.patch b/packages/glibc/2.30/0003-Fix-build-with-GCC-10-when-long-double-double.patch index ca0d8a7..d335a23 100644 --- a/packages/glibc/2.30/0003-Fix-build-with-GCC-10-when-long-double-double.patch +++ b/packages/glibc/2.30/0003-Fix-build-with-GCC-10-when-long-double-double.patch @@ -25,14 +25,12 @@ irrelevant for other reasons). Tested with build-many-glibcs.py for arm-linux-gnueabi (compilers and glibcs builds), where it fixes the build that previously failed. --- - math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++ + math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) -diff --git a/math/Makefile b/math/Makefile -index 84a8b94c74..0a5a40430e 100644 --- a/math/Makefile +++ b/math/Makefile -@@ -650,6 +650,128 @@ ifneq ($(long-double-fcts),yes) +@@ -658,6 +658,128 @@ # We won't compile the `long double' code at all. Tell the `double' code # to define aliases for the `FUNCl' names. math-CPPFLAGS += -DNO_LONG_DOUBLE @@ -161,6 +159,3 @@ index 84a8b94c74..0a5a40430e 100644 endif # These files quiet sNaNs in a way that is optimized away without --- -2.25.1 - diff --git a/packages/glibc/2.31/0001-Add-ARC-architecture.patch b/packages/glibc/2.31/0001-Add-ARC-architecture.patch index 6b5d514..e09be18 100644 --- a/packages/glibc/2.31/0001-Add-ARC-architecture.patch +++ b/packages/glibc/2.31/0001-Add-ARC-architecture.patch @@ -15,109 +15,109 @@ from 64-bit platforms), remove inclusion for syscall numbers, GET_PC -> sigcontext_get_pc rename. Only build-tested.] --- - elf/elf.h | 70 +- - locale/Makefile | 5 +- - scripts/build-many-glibcs.py | 4 + - stdlib/longlong.h | 6 +- - support/Makefile | 5 - - sysdeps/arc/Implies | 4 + - sysdeps/arc/Makefile | 25 + - sysdeps/arc/Versions | 6 + - sysdeps/arc/__longjmp.S | 50 + - sysdeps/arc/abort-instr.h | 2 + - sysdeps/arc/atomic-machine.h | 73 + - sysdeps/arc/bits/endianness.h | 15 + - sysdeps/arc/bits/fenv.h | 72 + - sysdeps/arc/bits/link.h | 52 + - sysdeps/arc/bits/setjmp.h | 26 + - sysdeps/arc/bsd-_setjmp.S | 1 + - sysdeps/arc/bsd-setjmp.S | 1 + - sysdeps/arc/configure | 14 + - sysdeps/arc/configure.ac | 11 + - sysdeps/arc/dl-machine.h | 340 +++ - sysdeps/arc/dl-runtime.c | 39 + - sysdeps/arc/dl-sysdep.h | 25 + - sysdeps/arc/dl-tls.h | 30 + - sysdeps/arc/dl-trampoline.S | 80 + - sysdeps/arc/entry.h | 5 + - sysdeps/arc/gccframe.h | 21 + - sysdeps/arc/gmp-mparam.h | 23 + - sysdeps/arc/jmpbuf-offsets.h | 47 + - sysdeps/arc/jmpbuf-unwind.h | 47 + - sysdeps/arc/ldsodefs.h | 43 + - sysdeps/arc/libc-tls.c | 27 + - sysdeps/arc/machine-gmon.h | 35 + - sysdeps/arc/memusage.h | 23 + - sysdeps/arc/nofpu/Implies | 1 + - sysdeps/arc/nofpu/libm-test-ulps | 390 +++ - sysdeps/arc/nofpu/libm-test-ulps-name | 1 + - sysdeps/arc/nofpu/math-tests-exceptions.h | 27 + - sysdeps/arc/nofpu/math-tests-rounding.h | 27 + - sysdeps/arc/nptl/Makefile | 22 + - sysdeps/arc/nptl/bits/pthreadtypes-arch.h | 43 + - sysdeps/arc/nptl/bits/semaphore.h | 32 + - sysdeps/arc/nptl/pthreaddef.h | 32 + - sysdeps/arc/nptl/tcb-offsets.sym | 11 + - sysdeps/arc/nptl/tls.h | 150 ++ - sysdeps/arc/preconfigure | 15 + - sysdeps/arc/setjmp.S | 66 + - sysdeps/arc/sfp-machine.h | 73 + - sysdeps/arc/sotruss-lib.c | 51 + - sysdeps/arc/stackinfo.h | 33 + - sysdeps/arc/start.S | 89 + - sysdeps/arc/sysdep.h | 48 + - sysdeps/arc/tls-macros.h | 47 + - sysdeps/arc/tst-audit.h | 23 + - sysdeps/unix/sysv/linux/arc/Implies | 3 + - sysdeps/unix/sysv/linux/arc/Makefile | 20 + - sysdeps/unix/sysv/linux/arc/Versions | 16 + - sysdeps/unix/sysv/linux/arc/arch-syscall.h | 317 +++ - sysdeps/unix/sysv/linux/arc/bits/procfs.h | 35 + - .../sysv/linux/arc/bits/types/__sigset_t.h | 12 + - sysdeps/unix/sysv/linux/arc/c++-types.data | 67 + - sysdeps/unix/sysv/linux/arc/clone.S | 98 + - sysdeps/unix/sysv/linux/arc/configure | 4 + - sysdeps/unix/sysv/linux/arc/configure.ac | 4 + - sysdeps/unix/sysv/linux/arc/dl-static.c | 84 + - sysdeps/unix/sysv/linux/arc/getcontext.S | 63 + - sysdeps/unix/sysv/linux/arc/ipc_priv.h | 21 + - sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h | 6 + - sysdeps/unix/sysv/linux/arc/kernel-features.h | 28 + - sysdeps/unix/sysv/linux/arc/ld.abilist | 9 + - sysdeps/unix/sysv/linux/arc/ldsodefs.h | 32 + - .../sysv/linux/arc/libBrokenLocale.abilist | 1 + - sysdeps/unix/sysv/linux/arc/libanl.abilist | 4 + - sysdeps/unix/sysv/linux/arc/libc.abilist | 2084 +++++++++++++++++ - sysdeps/unix/sysv/linux/arc/libcrypt.abilist | 2 + - sysdeps/unix/sysv/linux/arc/libdl.abilist | 9 + - sysdeps/unix/sysv/linux/arc/libm.abilist | 753 ++++++ - .../unix/sysv/linux/arc/libpthread.abilist | 240 ++ - sysdeps/unix/sysv/linux/arc/libresolv.abilist | 79 + - sysdeps/unix/sysv/linux/arc/librt.abilist | 35 + - .../unix/sysv/linux/arc/libthread_db.abilist | 40 + - sysdeps/unix/sysv/linux/arc/libutil.abilist | 6 + - sysdeps/unix/sysv/linux/arc/localplt.data | 16 + - sysdeps/unix/sysv/linux/arc/makecontext.c | 75 + - sysdeps/unix/sysv/linux/arc/mmap_internal.h | 27 + - sysdeps/unix/sysv/linux/arc/pt-vfork.S | 1 + - sysdeps/unix/sysv/linux/arc/setcontext.S | 92 + - sysdeps/unix/sysv/linux/arc/shlib-versions | 2 + - sysdeps/unix/sysv/linux/arc/sigaction.c | 31 + - sysdeps/unix/sysv/linux/arc/sigcontextinfo.h | 31 + - sysdeps/unix/sysv/linux/arc/sigrestorer.S | 29 + - sysdeps/unix/sysv/linux/arc/swapcontext.S | 92 + - sysdeps/unix/sysv/linux/arc/sys/cachectl.h | 36 + - sysdeps/unix/sysv/linux/arc/sys/ucontext.h | 63 + - sysdeps/unix/sysv/linux/arc/sys/user.h | 31 + - sysdeps/unix/sysv/linux/arc/syscall.S | 38 + - sysdeps/unix/sysv/linux/arc/syscalls.list | 3 + - sysdeps/unix/sysv/linux/arc/sysdep.c | 33 + - sysdeps/unix/sysv/linux/arc/sysdep.h | 250 ++ - sysdeps/unix/sysv/linux/arc/ucontext-macros.h | 29 + - sysdeps/unix/sysv/linux/arc/ucontext_i.sym | 20 + - sysdeps/unix/sysv/linux/arc/vfork.S | 42 + - sysdeps/unix/sysv/linux/syscall-names.list | 3 + - timezone/zic.c | 2 +- + elf/elf.h | 70 + locale/Makefile | 5 + scripts/build-many-glibcs.py | 4 + stdlib/longlong.h | 6 + support/Makefile | 5 + sysdeps/arc/Implies | 4 + sysdeps/arc/Makefile | 25 + sysdeps/arc/Versions | 6 + sysdeps/arc/__longjmp.S | 50 + sysdeps/arc/abort-instr.h | 2 + sysdeps/arc/atomic-machine.h | 73 + sysdeps/arc/bits/endianness.h | 15 + sysdeps/arc/bits/fenv.h | 72 + sysdeps/arc/bits/link.h | 52 + sysdeps/arc/bits/setjmp.h | 26 + sysdeps/arc/bsd-_setjmp.S | 1 + sysdeps/arc/bsd-setjmp.S | 1 + sysdeps/arc/configure | 14 + sysdeps/arc/configure.ac | 11 + sysdeps/arc/dl-machine.h | 340 +++ + sysdeps/arc/dl-runtime.c | 39 + sysdeps/arc/dl-sysdep.h | 25 + sysdeps/arc/dl-tls.h | 30 + sysdeps/arc/dl-trampoline.S | 80 + sysdeps/arc/entry.h | 5 + sysdeps/arc/gccframe.h | 21 + sysdeps/arc/gmp-mparam.h | 23 + sysdeps/arc/jmpbuf-offsets.h | 47 + sysdeps/arc/jmpbuf-unwind.h | 47 + sysdeps/arc/ldsodefs.h | 43 + sysdeps/arc/libc-tls.c | 27 + sysdeps/arc/machine-gmon.h | 35 + sysdeps/arc/memusage.h | 23 + sysdeps/arc/nofpu/Implies | 1 + sysdeps/arc/nofpu/libm-test-ulps | 390 +++ + sysdeps/arc/nofpu/libm-test-ulps-name | 1 + sysdeps/arc/nofpu/math-tests-exceptions.h | 27 + sysdeps/arc/nofpu/math-tests-rounding.h | 27 + sysdeps/arc/nptl/Makefile | 22 + sysdeps/arc/nptl/bits/pthreadtypes-arch.h | 43 + sysdeps/arc/nptl/bits/semaphore.h | 32 + sysdeps/arc/nptl/pthreaddef.h | 32 + sysdeps/arc/nptl/tcb-offsets.sym | 11 + sysdeps/arc/nptl/tls.h | 150 + + sysdeps/arc/preconfigure | 15 + sysdeps/arc/setjmp.S | 66 + sysdeps/arc/sfp-machine.h | 73 + sysdeps/arc/sotruss-lib.c | 51 + sysdeps/arc/stackinfo.h | 33 + sysdeps/arc/start.S | 89 + sysdeps/arc/sysdep.h | 48 + sysdeps/arc/tls-macros.h | 47 + sysdeps/arc/tst-audit.h | 23 + sysdeps/unix/sysv/linux/arc/Implies | 3 + sysdeps/unix/sysv/linux/arc/Makefile | 20 + sysdeps/unix/sysv/linux/arc/Versions | 16 + sysdeps/unix/sysv/linux/arc/arch-syscall.h | 317 +++ + sysdeps/unix/sysv/linux/arc/bits/procfs.h | 35 + sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h | 12 + sysdeps/unix/sysv/linux/arc/c++-types.data | 67 + sysdeps/unix/sysv/linux/arc/clone.S | 98 + sysdeps/unix/sysv/linux/arc/configure | 4 + sysdeps/unix/sysv/linux/arc/configure.ac | 4 + sysdeps/unix/sysv/linux/arc/dl-static.c | 84 + sysdeps/unix/sysv/linux/arc/getcontext.S | 63 + sysdeps/unix/sysv/linux/arc/ipc_priv.h | 21 + sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h | 6 + sysdeps/unix/sysv/linux/arc/kernel-features.h | 28 + sysdeps/unix/sysv/linux/arc/ld.abilist | 9 + sysdeps/unix/sysv/linux/arc/ldsodefs.h | 32 + sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist | 1 + sysdeps/unix/sysv/linux/arc/libanl.abilist | 4 + sysdeps/unix/sysv/linux/arc/libc.abilist | 2084 ++++++++++++++++++++ + sysdeps/unix/sysv/linux/arc/libcrypt.abilist | 2 + sysdeps/unix/sysv/linux/arc/libdl.abilist | 9 + sysdeps/unix/sysv/linux/arc/libm.abilist | 753 +++++++ + sysdeps/unix/sysv/linux/arc/libpthread.abilist | 240 ++ + sysdeps/unix/sysv/linux/arc/libresolv.abilist | 79 + sysdeps/unix/sysv/linux/arc/librt.abilist | 35 + sysdeps/unix/sysv/linux/arc/libthread_db.abilist | 40 + sysdeps/unix/sysv/linux/arc/libutil.abilist | 6 + sysdeps/unix/sysv/linux/arc/localplt.data | 16 + sysdeps/unix/sysv/linux/arc/makecontext.c | 75 + sysdeps/unix/sysv/linux/arc/mmap_internal.h | 27 + sysdeps/unix/sysv/linux/arc/pt-vfork.S | 1 + sysdeps/unix/sysv/linux/arc/setcontext.S | 92 + sysdeps/unix/sysv/linux/arc/shlib-versions | 2 + sysdeps/unix/sysv/linux/arc/sigaction.c | 31 + sysdeps/unix/sysv/linux/arc/sigcontextinfo.h | 31 + sysdeps/unix/sysv/linux/arc/sigrestorer.S | 29 + sysdeps/unix/sysv/linux/arc/swapcontext.S | 92 + sysdeps/unix/sysv/linux/arc/sys/cachectl.h | 36 + sysdeps/unix/sysv/linux/arc/sys/ucontext.h | 63 + sysdeps/unix/sysv/linux/arc/sys/user.h | 31 + sysdeps/unix/sysv/linux/arc/syscall.S | 38 + sysdeps/unix/sysv/linux/arc/syscalls.list | 3 + sysdeps/unix/sysv/linux/arc/sysdep.c | 33 + sysdeps/unix/sysv/linux/arc/sysdep.h | 250 ++ + sysdeps/unix/sysv/linux/arc/ucontext-macros.h | 29 + sysdeps/unix/sysv/linux/arc/ucontext_i.sym | 20 + sysdeps/unix/sysv/linux/arc/vfork.S | 42 + sysdeps/unix/sysv/linux/syscall-names.list | 3 + timezone/zic.c | 2 103 files changed, 7413 insertions(+), 13 deletions(-) create mode 100644 sysdeps/arc/Implies create mode 100644 sysdeps/arc/Makefile @@ -216,11 +216,9 @@ build-tested.] create mode 100644 sysdeps/unix/sysv/linux/arc/ucontext_i.sym create mode 100644 sysdeps/unix/sysv/linux/arc/vfork.S -diff --git a/elf/elf.h b/elf/elf.h -index 2549a177d6..1d235cf3ac 100644 --- a/elf/elf.h +++ b/elf/elf.h -@@ -330,7 +330,7 @@ typedef struct +@@ -330,7 +330,7 @@ #define EM_CLOUDSHIELD 192 /* CloudShield */ #define EM_COREA_1ST 193 /* KIPO-KAIST Core-A 1st gen. */ #define EM_COREA_2ND 194 /* KIPO-KAIST Core-A 2nd gen. */ @@ -229,7 +227,7 @@ index 2549a177d6..1d235cf3ac 100644 #define EM_OPEN8 196 /* Open8 RISC */ #define EM_RL78 197 /* Renesas RL78 */ #define EM_VIDEOCORE5 198 /* Broadcom VideoCore V */ -@@ -4027,6 +4027,74 @@ enum +@@ -4027,6 +4027,74 @@ #define R_NDS32_TLS_TPOFF 102 #define R_NDS32_TLS_DESC 119 @@ -304,11 +302,9 @@ index 2549a177d6..1d235cf3ac 100644 __END_DECLS #endif /* elf.h */ -diff --git a/locale/Makefile b/locale/Makefile -index c9694e236e..95a4a432a9 100644 --- a/locale/Makefile +++ b/locale/Makefile -@@ -28,6 +28,7 @@ routines = setlocale findlocale loadlocale loadarchive \ +@@ -28,6 +28,7 @@ localeconv nl_langinfo nl_langinfo_l mb_cur_max \ newlocale duplocale freelocale uselocale tests = tst-C-locale tst-locname tst-duplocale @@ -316,7 +312,7 @@ index c9694e236e..95a4a432a9 100644 categories = ctype messages monetary numeric time paper name \ address telephone measurement identification collate aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ -@@ -62,10 +63,6 @@ lib-modules := charmap-dir simple-hash xmalloc xstrdup \ +@@ -62,10 +63,6 @@ GPERF = gperf GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C @@ -327,11 +323,9 @@ index c9694e236e..95a4a432a9 100644 include ../Rules CFLAGS-md5.c += -I../crypt -diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py -index 90b76caa93..1fdf4d44c7 100755 --- a/scripts/build-many-glibcs.py +++ b/scripts/build-many-glibcs.py -@@ -155,6 +155,9 @@ class Context(object): +@@ -155,6 +155,9 @@ 'cfg': ['--disable-multi-arch']}]) self.add_config(arch='aarch64_be', os_name='linux-gnu') @@ -341,7 +335,7 @@ index 90b76caa93..1fdf4d44c7 100755 self.add_config(arch='alpha', os_name='linux-gnu') self.add_config(arch='arm', -@@ -1201,6 +1204,7 @@ class LinuxHeadersPolicyForUpdateSyscalls(object): +@@ -1201,6 +1204,7 @@ def install_linux_headers(policy, cmdlist): """Install Linux kernel headers.""" arch_map = {'aarch64': 'arm64', @@ -349,11 +343,9 @@ index 90b76caa93..1fdf4d44c7 100755 'alpha': 'alpha', 'arm': 'arm', 'csky': 'csky', -diff --git a/stdlib/longlong.h b/stdlib/longlong.h -index ee4aac1bb5..638b7894d4 100644 --- a/stdlib/longlong.h +++ b/stdlib/longlong.h -@@ -199,7 +199,8 @@ extern UDItype __udiv_qrnnd (UDItype *, UDItype, UDItype, UDItype); +@@ -199,7 +199,8 @@ : "%r" ((USItype) (ah)), \ "rICal" ((USItype) (bh)), \ "%r" ((USItype) (al)), \ @@ -363,7 +355,7 @@ index ee4aac1bb5..638b7894d4 100644 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ __asm__ ("sub.f %1, %4, %5\n\tsbc %0, %2, %3" \ : "=r" ((USItype) (sh)), \ -@@ -207,7 +208,8 @@ extern UDItype __udiv_qrnnd (UDItype *, UDItype, UDItype, UDItype); +@@ -207,7 +208,8 @@ : "r" ((USItype) (ah)), \ "rICal" ((USItype) (bh)), \ "r" ((USItype) (al)), \ @@ -373,11 +365,9 @@ index ee4aac1bb5..638b7894d4 100644 #define __umulsidi3(u,v) ((UDItype)(USItype)u*(USItype)v) #ifdef __ARC_NORM__ -diff --git a/support/Makefile b/support/Makefile -index 3325feb790..d9fdc46ffa 100644 --- a/support/Makefile +++ b/support/Makefile -@@ -188,12 +188,7 @@ CFLAGS-support_paths.c = \ +@@ -188,12 +188,7 @@ -DSBINDIR_PATH=\"$(sbindir)\" \ -DROOTSBINDIR_PATH=\"$(rootsbindir)\" @@ -390,9 +380,6 @@ index 3325feb790..d9fdc46ffa 100644 ifeq (yes,$(have-selinux)) LDLIBS-$(LINKS_DSO_PROGRAM) += -lselinux -diff --git a/sysdeps/arc/Implies b/sysdeps/arc/Implies -new file mode 100644 -index 0000000000..a0f0b00cfa --- /dev/null +++ b/sysdeps/arc/Implies @@ -0,0 +1,4 @@ @@ -400,9 +387,6 @@ index 0000000000..a0f0b00cfa +wordsize-32 +ieee754/flt-32 +ieee754/dbl-64 -diff --git a/sysdeps/arc/Makefile b/sysdeps/arc/Makefile -new file mode 100644 -index 0000000000..8d2fbe00c5 --- /dev/null +++ b/sysdeps/arc/Makefile @@ -0,0 +1,25 @@ @@ -431,9 +415,6 @@ index 0000000000..8d2fbe00c5 +ifeq ($(subdir),debug) +CFLAGS-backtrace.c += -funwind-tables +endif -diff --git a/sysdeps/arc/Versions b/sysdeps/arc/Versions -new file mode 100644 -index 0000000000..ca0856d2db --- /dev/null +++ b/sysdeps/arc/Versions @@ -0,0 +1,6 @@ @@ -443,9 +424,6 @@ index 0000000000..ca0856d2db + __mcount; + } +} -diff --git a/sysdeps/arc/__longjmp.S b/sysdeps/arc/__longjmp.S -new file mode 100644 -index 0000000000..8296aa445f --- /dev/null +++ b/sysdeps/arc/__longjmp.S @@ -0,0 +1,50 @@ @@ -499,17 +477,11 @@ index 0000000000..8296aa445f + mov.z r0, 1 ; can't let setjmp return 0 when it is due to longjmp + +END (__longjmp) -diff --git a/sysdeps/arc/abort-instr.h b/sysdeps/arc/abort-instr.h -new file mode 100644 -index 0000000000..49f33613c4 --- /dev/null +++ b/sysdeps/arc/abort-instr.h @@ -0,0 +1,2 @@ +/* FLAG 1 is privilege mode only instruction, hence will crash any program. */ +#define ABORT_INSTRUCTION asm ("flag 1") -diff --git a/sysdeps/arc/atomic-machine.h b/sysdeps/arc/atomic-machine.h -new file mode 100644 -index 0000000000..bdc91d0558 --- /dev/null +++ b/sysdeps/arc/atomic-machine.h @@ -0,0 +1,73 @@ @@ -586,9 +558,6 @@ index 0000000000..bdc91d0558 +#endif + +#endif /* _ARC_BITS_ATOMIC_H */ -diff --git a/sysdeps/arc/bits/endianness.h b/sysdeps/arc/bits/endianness.h -new file mode 100644 -index 0000000000..21fae520cd --- /dev/null +++ b/sysdeps/arc/bits/endianness.h @@ -0,0 +1,15 @@ @@ -607,9 +576,6 @@ index 0000000000..21fae520cd +# error "Big Endian NOt supported on ARC" +#endif +#endif /* bits/endianness.h */ -diff --git a/sysdeps/arc/bits/fenv.h b/sysdeps/arc/bits/fenv.h -new file mode 100644 -index 0000000000..58388fb43a --- /dev/null +++ b/sysdeps/arc/bits/fenv.h @@ -0,0 +1,72 @@ @@ -685,9 +651,6 @@ index 0000000000..58388fb43a +/* Default floating-point control modes. */ +# define FE_DFL_MODE ((const femode_t *) -1L) +#endif -diff --git a/sysdeps/arc/bits/link.h b/sysdeps/arc/bits/link.h -new file mode 100644 -index 0000000000..c4508ab666 --- /dev/null +++ b/sysdeps/arc/bits/link.h @@ -0,0 +1,52 @@ @@ -743,9 +706,6 @@ index 0000000000..c4508ab666 + const char *symname); + +__END_DECLS -diff --git a/sysdeps/arc/bits/setjmp.h b/sysdeps/arc/bits/setjmp.h -new file mode 100644 -index 0000000000..3cb457d097 --- /dev/null +++ b/sysdeps/arc/bits/setjmp.h @@ -0,0 +1,26 @@ @@ -775,23 +735,14 @@ index 0000000000..3cb457d097 +typedef long int __jmp_buf[32]; + +#endif -diff --git a/sysdeps/arc/bsd-_setjmp.S b/sysdeps/arc/bsd-_setjmp.S -new file mode 100644 -index 0000000000..90b99cd8c3 --- /dev/null +++ b/sysdeps/arc/bsd-_setjmp.S @@ -0,0 +1 @@ +/* _setjmp is in setjmp.S. */ -diff --git a/sysdeps/arc/bsd-setjmp.S b/sysdeps/arc/bsd-setjmp.S -new file mode 100644 -index 0000000000..d3b823c118 --- /dev/null +++ b/sysdeps/arc/bsd-setjmp.S @@ -0,0 +1 @@ +/* setjmp is in setjmp.S. */ -diff --git a/sysdeps/arc/configure b/sysdeps/arc/configure -new file mode 100644 -index 0000000000..52e286da2e --- /dev/null +++ b/sysdeps/arc/configure @@ -0,0 +1,14 @@ @@ -809,9 +760,6 @@ index 0000000000..52e286da2e +cat >>confdefs.h <<_ACEOF +#define ASM_LINE_SEP $libc_cv_asm_line_sep +_ACEOF -diff --git a/sysdeps/arc/configure.ac b/sysdeps/arc/configure.ac -new file mode 100644 -index 0000000000..1074d312f0 --- /dev/null +++ b/sysdeps/arc/configure.ac @@ -0,0 +1,11 @@ @@ -826,9 +774,6 @@ index 0000000000..1074d312f0 +# canonical newline as there's lots of code out there which will break +libc_cv_asm_line_sep='`' +AC_DEFINE_UNQUOTED(ASM_LINE_SEP, $libc_cv_asm_line_sep) -diff --git a/sysdeps/arc/dl-machine.h b/sysdeps/arc/dl-machine.h -new file mode 100644 -index 0000000000..c81acb9d4f --- /dev/null +++ b/sysdeps/arc/dl-machine.h @@ -0,0 +1,340 @@ @@ -1172,9 +1117,6 @@ index 0000000000..c81acb9d4f +} + +#endif /* RESOLVE_MAP */ -diff --git a/sysdeps/arc/dl-runtime.c b/sysdeps/arc/dl-runtime.c -new file mode 100644 -index 0000000000..48f4a5a7e1 --- /dev/null +++ b/sysdeps/arc/dl-runtime.c @@ -0,0 +1,39 @@ @@ -1217,9 +1159,6 @@ index 0000000000..48f4a5a7e1 +#define reloc_offset reloc_index * sizeof (PLTREL) + +#include -diff --git a/sysdeps/arc/dl-sysdep.h b/sysdeps/arc/dl-sysdep.h -new file mode 100644 -index 0000000000..ffc30b6937 --- /dev/null +++ b/sysdeps/arc/dl-sysdep.h @@ -0,0 +1,25 @@ @@ -1248,9 +1187,6 @@ index 0000000000..ffc30b6937 +#define DL_ARGV_NOT_RELRO 1 + +#define DL_EXTERN_PROTECTED_DATA -diff --git a/sysdeps/arc/dl-tls.h b/sysdeps/arc/dl-tls.h -new file mode 100644 -index 0000000000..7f0cf91e40 --- /dev/null +++ b/sysdeps/arc/dl-tls.h @@ -0,0 +1,30 @@ @@ -1284,9 +1220,6 @@ index 0000000000..7f0cf91e40 + +/* Value used for dtv entries for which the allocation is delayed. */ +#define TLS_DTV_UNALLOCATED ((void *) -1l) -diff --git a/sysdeps/arc/dl-trampoline.S b/sysdeps/arc/dl-trampoline.S -new file mode 100644 -index 0000000000..9da75fb1fe --- /dev/null +++ b/sysdeps/arc/dl-trampoline.S @@ -0,0 +1,80 @@ @@ -1370,9 +1303,6 @@ index 0000000000..9da75fb1fe + cfi_adjust_cfa_offset (-4) + cfi_restore (r0) +END (_dl_runtime_resolve) -diff --git a/sysdeps/arc/entry.h b/sysdeps/arc/entry.h -new file mode 100644 -index 0000000000..adb01d981a --- /dev/null +++ b/sysdeps/arc/entry.h @@ -0,0 +1,5 @@ @@ -1381,9 +1311,6 @@ index 0000000000..adb01d981a +#endif + +#define ENTRY_POINT __start -diff --git a/sysdeps/arc/gccframe.h b/sysdeps/arc/gccframe.h -new file mode 100644 -index 0000000000..40487fa77b --- /dev/null +++ b/sysdeps/arc/gccframe.h @@ -0,0 +1,21 @@ @@ -1408,9 +1335,6 @@ index 0000000000..40487fa77b +#define FIRST_PSEUDO_REGISTER 40 + +#include -diff --git a/sysdeps/arc/gmp-mparam.h b/sysdeps/arc/gmp-mparam.h -new file mode 100644 -index 0000000000..e30695fc6b --- /dev/null +++ b/sysdeps/arc/gmp-mparam.h @@ -0,0 +1,23 @@ @@ -1437,9 +1361,6 @@ index 0000000000..e30695fc6b +#include + +#define IEEE_DOUBLE_BIG_ENDIAN 0 -diff --git a/sysdeps/arc/jmpbuf-offsets.h b/sysdeps/arc/jmpbuf-offsets.h -new file mode 100644 -index 0000000000..9760f3a389 --- /dev/null +++ b/sysdeps/arc/jmpbuf-offsets.h @@ -0,0 +1,47 @@ @@ -1490,9 +1411,6 @@ index 0000000000..9760f3a389 + +/* Helper for generic ____longjmp_chk(). */ +#define JB_FRAME_ADDRESS(buf) ((void *) (unsigned long int) (buf[JB_SP])) -diff --git a/sysdeps/arc/jmpbuf-unwind.h b/sysdeps/arc/jmpbuf-unwind.h -new file mode 100644 -index 0000000000..47be5758c7 --- /dev/null +++ b/sysdeps/arc/jmpbuf-unwind.h @@ -0,0 +1,47 @@ @@ -1543,9 +1461,6 @@ index 0000000000..47be5758c7 + +/* We use the normal longjmp for unwinding. */ +#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) -diff --git a/sysdeps/arc/ldsodefs.h b/sysdeps/arc/ldsodefs.h -new file mode 100644 -index 0000000000..53ef4e1e83 --- /dev/null +++ b/sysdeps/arc/ldsodefs.h @@ -0,0 +1,43 @@ @@ -1592,9 +1507,6 @@ index 0000000000..53ef4e1e83 +#include_next + +#endif -diff --git a/sysdeps/arc/libc-tls.c b/sysdeps/arc/libc-tls.c -new file mode 100644 -index 0000000000..903a75a41b --- /dev/null +++ b/sysdeps/arc/libc-tls.c @@ -0,0 +1,27 @@ @@ -1625,9 +1537,6 @@ index 0000000000..903a75a41b + dtv_t *dtv = THREAD_DTV (); + return (char *) dtv[1].pointer.val + ti->ti_offset; +} -diff --git a/sysdeps/arc/machine-gmon.h b/sysdeps/arc/machine-gmon.h -new file mode 100644 -index 0000000000..1d9e8108d9 --- /dev/null +++ b/sysdeps/arc/machine-gmon.h @@ -0,0 +1,35 @@ @@ -1666,9 +1575,6 @@ index 0000000000..1d9e8108d9 + __mcount_internal ((unsigned long int) frompc, \ + (unsigned long int) __builtin_return_address(0)); \ +} -diff --git a/sysdeps/arc/memusage.h b/sysdeps/arc/memusage.h -new file mode 100644 -index 0000000000..29f234f5ba --- /dev/null +++ b/sysdeps/arc/memusage.h @@ -0,0 +1,23 @@ @@ -1695,16 +1601,10 @@ index 0000000000..29f234f5ba +#define uatomic32_t unsigned int + +#include -diff --git a/sysdeps/arc/nofpu/Implies b/sysdeps/arc/nofpu/Implies -new file mode 100644 -index 0000000000..abcbadb25f --- /dev/null +++ b/sysdeps/arc/nofpu/Implies @@ -0,0 +1 @@ +ieee754/soft-fp -diff --git a/sysdeps/arc/nofpu/libm-test-ulps b/sysdeps/arc/nofpu/libm-test-ulps -new file mode 100644 -index 0000000000..0e8ef313fa --- /dev/null +++ b/sysdeps/arc/nofpu/libm-test-ulps @@ -0,0 +1,390 @@ @@ -2098,16 +1998,10 @@ index 0000000000..0e8ef313fa +ifloat: 3 + +# end of automatic generation -diff --git a/sysdeps/arc/nofpu/libm-test-ulps-name b/sysdeps/arc/nofpu/libm-test-ulps-name -new file mode 100644 -index 0000000000..8c4fba4f9a --- /dev/null +++ b/sysdeps/arc/nofpu/libm-test-ulps-name @@ -0,0 +1 @@ +ARC -diff --git a/sysdeps/arc/nofpu/math-tests-exceptions.h b/sysdeps/arc/nofpu/math-tests-exceptions.h -new file mode 100644 -index 0000000000..f5c0b73589 --- /dev/null +++ b/sysdeps/arc/nofpu/math-tests-exceptions.h @@ -0,0 +1,27 @@ @@ -2138,9 +2032,6 @@ index 0000000000..f5c0b73589 +#define EXCEPTION_TESTS_long_double 0 + +#endif -diff --git a/sysdeps/arc/nofpu/math-tests-rounding.h b/sysdeps/arc/nofpu/math-tests-rounding.h -new file mode 100644 -index 0000000000..e8f76338b1 --- /dev/null +++ b/sysdeps/arc/nofpu/math-tests-rounding.h @@ -0,0 +1,27 @@ @@ -2171,9 +2062,6 @@ index 0000000000..e8f76338b1 +#define ROUNDING_TESTS_long_double(MODE) ((MODE) == FE_TONEAREST) + +#endif -diff --git a/sysdeps/arc/nptl/Makefile b/sysdeps/arc/nptl/Makefile -new file mode 100644 -index 0000000000..3c33c9cc11 --- /dev/null +++ b/sysdeps/arc/nptl/Makefile @@ -0,0 +1,22 @@ @@ -2199,9 +2087,6 @@ index 0000000000..3c33c9cc11 +ifeq ($(subdir),csu) +gen-as-const-headers += tcb-offsets.sym +endif -diff --git a/sysdeps/arc/nptl/bits/pthreadtypes-arch.h b/sysdeps/arc/nptl/bits/pthreadtypes-arch.h -new file mode 100644 -index 0000000000..c104ad4444 --- /dev/null +++ b/sysdeps/arc/nptl/bits/pthreadtypes-arch.h @@ -0,0 +1,43 @@ @@ -2248,9 +2133,6 @@ index 0000000000..c104ad4444 +#define __ONCE_ALIGNMENT + +#endif /* bits/pthreadtypes-arch.h */ -diff --git a/sysdeps/arc/nptl/bits/semaphore.h b/sysdeps/arc/nptl/bits/semaphore.h -new file mode 100644 -index 0000000000..662d08401d --- /dev/null +++ b/sysdeps/arc/nptl/bits/semaphore.h @@ -0,0 +1,32 @@ @@ -2286,9 +2168,6 @@ index 0000000000..662d08401d + char __size[__SIZEOF_SEM_T]; + long int __align; +} sem_t; -diff --git a/sysdeps/arc/nptl/pthreaddef.h b/sysdeps/arc/nptl/pthreaddef.h -new file mode 100644 -index 0000000000..80a109bbd5 --- /dev/null +++ b/sysdeps/arc/nptl/pthreaddef.h @@ -0,0 +1,32 @@ @@ -2324,9 +2203,6 @@ index 0000000000..80a109bbd5 + +/* Location of current stack frame. */ +#define CURRENT_STACK_FRAME __builtin_frame_address (0) -diff --git a/sysdeps/arc/nptl/tcb-offsets.sym b/sysdeps/arc/nptl/tcb-offsets.sym -new file mode 100644 -index 0000000000..56950e0676 --- /dev/null +++ b/sysdeps/arc/nptl/tcb-offsets.sym @@ -0,0 +1,11 @@ @@ -2341,9 +2217,6 @@ index 0000000000..56950e0676 +TLS_TCB_SIZE sizeof(tcbhead_t) + +PTHREAD_TID offsetof(struct pthread, tid) -diff --git a/sysdeps/arc/nptl/tls.h b/sysdeps/arc/nptl/tls.h -new file mode 100644 -index 0000000000..2c90109d57 --- /dev/null +++ b/sysdeps/arc/nptl/tls.h @@ -0,0 +1,150 @@ @@ -2497,9 +2370,6 @@ index 0000000000..2c90109d57 +#endif /* __ASSEMBLER__ */ + +#endif /* tls.h */ -diff --git a/sysdeps/arc/preconfigure b/sysdeps/arc/preconfigure -new file mode 100644 -index 0000000000..d9c5429f40 --- /dev/null +++ b/sysdeps/arc/preconfigure @@ -0,0 +1,15 @@ @@ -2518,9 +2388,6 @@ index 0000000000..d9c5429f40 + ;; + +esac -diff --git a/sysdeps/arc/setjmp.S b/sysdeps/arc/setjmp.S -new file mode 100644 -index 0000000000..518545a99e --- /dev/null +++ b/sysdeps/arc/setjmp.S @@ -0,0 +1,66 @@ @@ -2590,9 +2457,6 @@ index 0000000000..518545a99e +END (__sigsetjmp) + +libc_hidden_def (__sigsetjmp) -diff --git a/sysdeps/arc/sfp-machine.h b/sysdeps/arc/sfp-machine.h -new file mode 100644 -index 0000000000..5ceaf56a98 --- /dev/null +++ b/sysdeps/arc/sfp-machine.h @@ -0,0 +1,73 @@ @@ -2669,9 +2533,6 @@ index 0000000000..5ceaf56a98 + } while (0) + +#define _FP_TININESS_AFTER_ROUNDING 0 -diff --git a/sysdeps/arc/sotruss-lib.c b/sysdeps/arc/sotruss-lib.c -new file mode 100644 -index 0000000000..ffbb5bbd6d --- /dev/null +++ b/sysdeps/arc/sotruss-lib.c @@ -0,0 +1,51 @@ @@ -2726,9 +2587,6 @@ index 0000000000..ffbb5bbd6d + + return 0; +} -diff --git a/sysdeps/arc/stackinfo.h b/sysdeps/arc/stackinfo.h -new file mode 100644 -index 0000000000..fe69161382 --- /dev/null +++ b/sysdeps/arc/stackinfo.h @@ -0,0 +1,33 @@ @@ -2765,9 +2623,6 @@ index 0000000000..fe69161382 +#define DEFAULT_STACK_PERMS (PF_R|PF_W) + +#endif /* stackinfo.h */ -diff --git a/sysdeps/arc/start.S b/sysdeps/arc/start.S -new file mode 100644 -index 0000000000..4ade1e871f --- /dev/null +++ b/sysdeps/arc/start.S @@ -0,0 +1,89 @@ @@ -2860,9 +2715,6 @@ index 0000000000..4ade1e871f + .long 0 + .weak data_start + data_start = __data_start -diff --git a/sysdeps/arc/sysdep.h b/sysdeps/arc/sysdep.h -new file mode 100644 -index 0000000000..127e9b01e7 --- /dev/null +++ b/sysdeps/arc/sysdep.h @@ -0,0 +1,48 @@ @@ -2914,9 +2766,6 @@ index 0000000000..127e9b01e7 +# define CALL_MCOUNT /* Do nothing for now. */ + +#endif /* __ASSEMBLER__ */ -diff --git a/sysdeps/arc/tls-macros.h b/sysdeps/arc/tls-macros.h -new file mode 100644 -index 0000000000..4d54683eda --- /dev/null +++ b/sysdeps/arc/tls-macros.h @@ -0,0 +1,47 @@ @@ -2967,9 +2816,6 @@ index 0000000000..4d54683eda + "add %0, %1, %0 \n" \ + : "=&r" (__result) : "r" (tp)); \ + __result; }) -diff --git a/sysdeps/arc/tst-audit.h b/sysdeps/arc/tst-audit.h -new file mode 100644 -index 0000000000..9237ad2440 --- /dev/null +++ b/sysdeps/arc/tst-audit.h @@ -0,0 +1,23 @@ @@ -2996,18 +2842,12 @@ index 0000000000..9237ad2440 +#define La_regs La_arc_regs +#define La_retval La_arc_retval +#define int_retval lrv_reg[0] -diff --git a/sysdeps/unix/sysv/linux/arc/Implies b/sysdeps/unix/sysv/linux/arc/Implies -new file mode 100644 -index 0000000000..7f739a0340 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/Implies @@ -0,0 +1,3 @@ +arc/nptl +unix/sysv/linux/generic/wordsize-32 +unix/sysv/linux/generic -diff --git a/sysdeps/unix/sysv/linux/arc/Makefile b/sysdeps/unix/sysv/linux/arc/Makefile -new file mode 100644 -index 0000000000..a6c6dfc6ec --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/Makefile @@ -0,0 +1,20 @@ @@ -3031,9 +2871,6 @@ index 0000000000..a6c6dfc6ec +sysdep-dl-routines += dl-static +endif +endif -diff --git a/sysdeps/unix/sysv/linux/arc/Versions b/sysdeps/unix/sysv/linux/arc/Versions -new file mode 100644 -index 0000000000..3eedf26ae2 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/Versions @@ -0,0 +1,16 @@ @@ -3053,9 +2890,6 @@ index 0000000000..3eedf26ae2 + __default_rt_sa_restorer; + } +} -diff --git a/sysdeps/unix/sysv/linux/arc/arch-syscall.h b/sysdeps/unix/sysv/linux/arc/arch-syscall.h -new file mode 100644 -index 0000000000..db25a17ad0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/arch-syscall.h @@ -0,0 +1,317 @@ @@ -3376,9 +3210,6 @@ index 0000000000..db25a17ad0 +#define __NR_waitid 95 +#define __NR_write 64 +#define __NR_writev 66 -diff --git a/sysdeps/unix/sysv/linux/arc/bits/procfs.h b/sysdeps/unix/sysv/linux/arc/bits/procfs.h -new file mode 100644 -index 0000000000..b37deaee58 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/bits/procfs.h @@ -0,0 +1,35 @@ @@ -3417,9 +3248,6 @@ index 0000000000..b37deaee58 + +/* There's no seperate floating point reg file in ARCv2. */ +typedef struct { } elf_fpregset_t; -diff --git a/sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h b/sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h -new file mode 100644 -index 0000000000..795638a30b --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/bits/types/__sigset_t.h @@ -0,0 +1,12 @@ @@ -3435,9 +3263,6 @@ index 0000000000..795638a30b +} __sigset_t; + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/c++-types.data b/sysdeps/unix/sysv/linux/arc/c++-types.data -new file mode 100644 -index 0000000000..303f4570c8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/c++-types.data @@ -0,0 +1,67 @@ @@ -3508,9 +3333,6 @@ index 0000000000..303f4570c8 +useconds_t:j +ushort:t +u_short:t -diff --git a/sysdeps/unix/sysv/linux/arc/clone.S b/sysdeps/unix/sysv/linux/arc/clone.S -new file mode 100644 -index 0000000000..55c2a2b60e --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/clone.S @@ -0,0 +1,98 @@ @@ -3612,9 +3434,6 @@ index 0000000000..55c2a2b60e +PSEUDO_END (__clone) +libc_hidden_def (__clone) +weak_alias (__clone, clone) -diff --git a/sysdeps/unix/sysv/linux/arc/configure b/sysdeps/unix/sysv/linux/arc/configure -new file mode 100644 -index 0000000000..f74fa7cb02 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/configure @@ -0,0 +1,4 @@ @@ -3622,9 +3441,6 @@ index 0000000000..f74fa7cb02 + # Local configure fragment for sysdeps/unix/sysv/linux/arc. + +arch_minimum_kernel=3.9.0 -diff --git a/sysdeps/unix/sysv/linux/arc/configure.ac b/sysdeps/unix/sysv/linux/arc/configure.ac -new file mode 100644 -index 0000000000..a9528032d3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/configure.ac @@ -0,0 +1,4 @@ @@ -3632,9 +3448,6 @@ index 0000000000..a9528032d3 +# Local configure fragment for sysdeps/unix/sysv/linux/arc. + +arch_minimum_kernel=3.9.0 -diff --git a/sysdeps/unix/sysv/linux/arc/dl-static.c b/sysdeps/unix/sysv/linux/arc/dl-static.c -new file mode 100644 -index 0000000000..1a8757c984 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/dl-static.c @@ -0,0 +1,84 @@ @@ -3722,9 +3535,6 @@ index 0000000000..1a8757c984 +} + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/getcontext.S b/sysdeps/unix/sysv/linux/arc/getcontext.S -new file mode 100644 -index 0000000000..723cc237d8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/getcontext.S @@ -0,0 +1,63 @@ @@ -3791,9 +3601,6 @@ index 0000000000..723cc237d8 + +PSEUDO_END (__getcontext) +weak_alias (__getcontext, getcontext) -diff --git a/sysdeps/unix/sysv/linux/arc/ipc_priv.h b/sysdeps/unix/sysv/linux/arc/ipc_priv.h -new file mode 100644 -index 0000000000..309eb3064e --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ipc_priv.h @@ -0,0 +1,21 @@ @@ -3818,9 +3625,6 @@ index 0000000000..309eb3064e +#include /* For __key_t */ + +#define __IPC_64 0x0 -diff --git a/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h -new file mode 100644 -index 0000000000..6c12939848 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/jmp_buf-macros.h @@ -0,0 +1,6 @@ @@ -3830,9 +3634,6 @@ index 0000000000..6c12939848 +#define SIGJMP_BUF_ALIGN __alignof__ (unsigned long int) +#define MASK_WAS_SAVED_OFFSET (32 * sizeof (unsigned long int)) +#define SAVED_MASK_OFFSET (33 * sizeof (unsigned long int)) -diff --git a/sysdeps/unix/sysv/linux/arc/kernel-features.h b/sysdeps/unix/sysv/linux/arc/kernel-features.h -new file mode 100644 -index 0000000000..00255337bc --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/kernel-features.h @@ -0,0 +1,28 @@ @@ -3864,9 +3665,6 @@ index 0000000000..00255337bc + +#undef __ASSUME_CLONE_DEFAULT +#define __ASSUME_CLONE_BACKWARDS 1 -diff --git a/sysdeps/unix/sysv/linux/arc/ld.abilist b/sysdeps/unix/sysv/linux/arc/ld.abilist -new file mode 100644 -index 0000000000..41183d7bee --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ld.abilist @@ -0,0 +1,9 @@ @@ -3879,9 +3677,6 @@ index 0000000000..41183d7bee +GLIBC_2.30 free F +GLIBC_2.30 malloc F +GLIBC_2.30 realloc F -diff --git a/sysdeps/unix/sysv/linux/arc/ldsodefs.h b/sysdeps/unix/sysv/linux/arc/ldsodefs.h -new file mode 100644 -index 0000000000..8c5c6800af --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ldsodefs.h @@ -0,0 +1,32 @@ @@ -3917,16 +3712,10 @@ index 0000000000..8c5c6800af +#define DL_STATIC_INIT(map) _dl_static_init (map) + +#endif /* ldsodefs.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist -new file mode 100644 -index 0000000000..c6253c0ae8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libBrokenLocale.abilist @@ -0,0 +1 @@ +GLIBC_2.30 __ctype_get_mb_cur_max F -diff --git a/sysdeps/unix/sysv/linux/arc/libanl.abilist b/sysdeps/unix/sysv/linux/arc/libanl.abilist -new file mode 100644 -index 0000000000..d3b753219e --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libanl.abilist @@ -0,0 +1,4 @@ @@ -3934,9 +3723,6 @@ index 0000000000..d3b753219e +GLIBC_2.30 gai_error F +GLIBC_2.30 gai_suspend F +GLIBC_2.30 getaddrinfo_a F -diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist -new file mode 100644 -index 0000000000..823ae25bcc --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -0,0 +1,2084 @@ @@ -6024,17 +5810,11 @@ index 0000000000..823ae25bcc +GLIBC_2.30 xencrypt F +GLIBC_2.30 xprt_register F +GLIBC_2.30 xprt_unregister F -diff --git a/sysdeps/unix/sysv/linux/arc/libcrypt.abilist b/sysdeps/unix/sysv/linux/arc/libcrypt.abilist -new file mode 100644 -index 0000000000..8d83578d8c --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libcrypt.abilist @@ -0,0 +1,2 @@ +GLIBC_2.30 crypt F +GLIBC_2.30 crypt_r F -diff --git a/sysdeps/unix/sysv/linux/arc/libdl.abilist b/sysdeps/unix/sysv/linux/arc/libdl.abilist -new file mode 100644 -index 0000000000..3fc6d95b85 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libdl.abilist @@ -0,0 +1,9 @@ @@ -6047,9 +5827,6 @@ index 0000000000..3fc6d95b85 +GLIBC_2.30 dlopen F +GLIBC_2.30 dlsym F +GLIBC_2.30 dlvsym F -diff --git a/sysdeps/unix/sysv/linux/arc/libm.abilist b/sysdeps/unix/sysv/linux/arc/libm.abilist -new file mode 100644 -index 0000000000..43f3a97e6f --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libm.abilist @@ -0,0 +1,753 @@ @@ -6806,9 +6583,6 @@ index 0000000000..43f3a97e6f +GLIBC_2.30 ynf32x F +GLIBC_2.30 ynf64 F +GLIBC_2.30 ynl F -diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist -new file mode 100644 -index 0000000000..d89cf8d301 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -0,0 +1,240 @@ @@ -7052,9 +6826,6 @@ index 0000000000..d89cf8d301 +GLIBC_2.30 wait F +GLIBC_2.30 waitpid F +GLIBC_2.30 write F -diff --git a/sysdeps/unix/sysv/linux/arc/libresolv.abilist b/sysdeps/unix/sysv/linux/arc/libresolv.abilist -new file mode 100644 -index 0000000000..ca745f5b98 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libresolv.abilist @@ -0,0 +1,79 @@ @@ -7137,9 +6908,6 @@ index 0000000000..ca745f5b98 +GLIBC_2.30 ns_sprintrr F +GLIBC_2.30 ns_sprintrrf F +GLIBC_2.30 ns_subdomain F -diff --git a/sysdeps/unix/sysv/linux/arc/librt.abilist b/sysdeps/unix/sysv/linux/arc/librt.abilist -new file mode 100644 -index 0000000000..8d39a08696 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/librt.abilist @@ -0,0 +1,35 @@ @@ -7178,9 +6946,6 @@ index 0000000000..8d39a08696 +GLIBC_2.30 timer_getoverrun F +GLIBC_2.30 timer_gettime F +GLIBC_2.30 timer_settime F -diff --git a/sysdeps/unix/sysv/linux/arc/libthread_db.abilist b/sysdeps/unix/sysv/linux/arc/libthread_db.abilist -new file mode 100644 -index 0000000000..94220c9592 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libthread_db.abilist @@ -0,0 +1,40 @@ @@ -7224,9 +6989,6 @@ index 0000000000..94220c9592 +GLIBC_2.30 td_thr_tlsbase F +GLIBC_2.30 td_thr_tsd F +GLIBC_2.30 td_thr_validate F -diff --git a/sysdeps/unix/sysv/linux/arc/libutil.abilist b/sysdeps/unix/sysv/linux/arc/libutil.abilist -new file mode 100644 -index 0000000000..f745157afa --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/libutil.abilist @@ -0,0 +1,6 @@ @@ -7236,9 +6998,6 @@ index 0000000000..f745157afa +GLIBC_2.30 logout F +GLIBC_2.30 logwtmp F +GLIBC_2.30 openpty F -diff --git a/sysdeps/unix/sysv/linux/arc/localplt.data b/sysdeps/unix/sysv/linux/arc/localplt.data -new file mode 100644 -index 0000000000..e902fd0607 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/localplt.data @@ -0,0 +1,16 @@ @@ -7258,9 +7017,6 @@ index 0000000000..e902fd0607 +ld.so: _dl_catch_error +ld.so: _dl_signal_exception +ld.so: _dl_catch_exception -diff --git a/sysdeps/unix/sysv/linux/arc/makecontext.c b/sysdeps/unix/sysv/linux/arc/makecontext.c -new file mode 100644 -index 0000000000..3d46452e17 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/makecontext.c @@ -0,0 +1,75 @@ @@ -7339,9 +7095,6 @@ index 0000000000..3d46452e17 +} + +weak_alias (__makecontext, makecontext) -diff --git a/sysdeps/unix/sysv/linux/arc/mmap_internal.h b/sysdeps/unix/sysv/linux/arc/mmap_internal.h -new file mode 100644 -index 0000000000..51d0a25f26 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/mmap_internal.h @@ -0,0 +1,27 @@ @@ -7372,16 +7125,10 @@ index 0000000000..51d0a25f26 +#include_next + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/pt-vfork.S b/sysdeps/unix/sysv/linux/arc/pt-vfork.S -new file mode 100644 -index 0000000000..1cc8931700 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/pt-vfork.S @@ -0,0 +1 @@ +/* Not needed. */ -diff --git a/sysdeps/unix/sysv/linux/arc/setcontext.S b/sysdeps/unix/sysv/linux/arc/setcontext.S -new file mode 100644 -index 0000000000..8cf4ffcaf5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/setcontext.S @@ -0,0 +1,92 @@ @@ -7477,17 +7224,11 @@ index 0000000000..8cf4ffcaf5 + /* Exit with status 0. */ + b HIDDEN_JUMPTARGET(exit) +END (__startcontext) -diff --git a/sysdeps/unix/sysv/linux/arc/shlib-versions b/sysdeps/unix/sysv/linux/arc/shlib-versions -new file mode 100644 -index 0000000000..cbe457b9db --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/shlib-versions @@ -0,0 +1,2 @@ +DEFAULT GLIBC_2.30 +ld=ld-linux-arc.so.2 -diff --git a/sysdeps/unix/sysv/linux/arc/sigaction.c b/sysdeps/unix/sysv/linux/arc/sigaction.c -new file mode 100644 -index 0000000000..db7293865f --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sigaction.c @@ -0,0 +1,31 @@ @@ -7522,9 +7263,6 @@ index 0000000000..db7293865f +#define RESET_SA_RESTORER(act, kact) + +#include -diff --git a/sysdeps/unix/sysv/linux/arc/sigcontextinfo.h b/sysdeps/unix/sysv/linux/arc/sigcontextinfo.h -new file mode 100644 -index 0000000000..db5f4b6d21 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sigcontextinfo.h @@ -0,0 +1,31 @@ @@ -7559,9 +7297,6 @@ index 0000000000..db5f4b6d21 +} + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/sigrestorer.S b/sysdeps/unix/sysv/linux/arc/sigrestorer.S -new file mode 100644 -index 0000000000..573b54e36c --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sigrestorer.S @@ -0,0 +1,29 @@ @@ -7594,9 +7329,6 @@ index 0000000000..573b54e36c + ARC_TRAP_INSN + j_s [blink] +PSEUDO_END_NOERRNO (__default_rt_sa_restorer) -diff --git a/sysdeps/unix/sysv/linux/arc/swapcontext.S b/sysdeps/unix/sysv/linux/arc/swapcontext.S -new file mode 100644 -index 0000000000..853d3805de --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/swapcontext.S @@ -0,0 +1,92 @@ @@ -7692,9 +7424,6 @@ index 0000000000..853d3805de + +PSEUDO_END (__swapcontext) +weak_alias (__swapcontext, swapcontext) -diff --git a/sysdeps/unix/sysv/linux/arc/sys/cachectl.h b/sysdeps/unix/sysv/linux/arc/sys/cachectl.h -new file mode 100644 -index 0000000000..2d93e49e6a --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sys/cachectl.h @@ -0,0 +1,36 @@ @@ -7734,9 +7463,6 @@ index 0000000000..2d93e49e6a +__END_DECLS + +#endif /* sys/cachectl.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/sys/ucontext.h b/sysdeps/unix/sysv/linux/arc/sys/ucontext.h -new file mode 100644 -index 0000000000..7e357bcd65 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sys/ucontext.h @@ -0,0 +1,63 @@ @@ -7803,9 +7529,6 @@ index 0000000000..7e357bcd65 +#undef __ctx + +#endif /* sys/ucontext.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/sys/user.h b/sysdeps/unix/sysv/linux/arc/sys/user.h -new file mode 100644 -index 0000000000..50d0dc7827 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sys/user.h @@ -0,0 +1,31 @@ @@ -7840,9 +7563,6 @@ index 0000000000..50d0dc7827 +}; + +#endif /* sys/user.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S -new file mode 100644 -index 0000000000..3fe5fcdd04 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/syscall.S @@ -0,0 +1,38 @@ @@ -7884,18 +7604,12 @@ index 0000000000..3fe5fcdd04 + brhi r0, -1024, .Lcall_syscall_err + j [blink] +PSEUDO_END (syscall) -diff --git a/sysdeps/unix/sysv/linux/arc/syscalls.list b/sysdeps/unix/sysv/linux/arc/syscalls.list -new file mode 100644 -index 0000000000..d0ef5977ee --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/syscalls.list @@ -0,0 +1,3 @@ +# File name Caller Syscall name Args Strong name Weak names + +cacheflush - cacheflush i:pii _flush_cache cacheflush -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.c b/sysdeps/unix/sysv/linux/arc/sysdep.c -new file mode 100644 -index 0000000000..5618f37851 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sysdep.c @@ -0,0 +1,33 @@ @@ -7932,9 +7646,6 @@ index 0000000000..5618f37851 +#if IS_IN (libc) +hidden_def (__syscall_error) +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h -new file mode 100644 -index 0000000000..28547ac448 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/sysdep.h @@ -0,0 +1,250 @@ @@ -8188,9 +7899,6 @@ index 0000000000..28547ac448 +#endif /* !__ASSEMBLER__ */ + +#endif /* linux/arc/sysdep.h */ -diff --git a/sysdeps/unix/sysv/linux/arc/ucontext-macros.h b/sysdeps/unix/sysv/linux/arc/ucontext-macros.h -new file mode 100644 -index 0000000000..ed261399c9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ucontext-macros.h @@ -0,0 +1,29 @@ @@ -8223,9 +7931,6 @@ index 0000000000..ed261399c9 +#define LOAD_REG(reg, rbase, off) ld reg, [rbase, UCONTEXT_MCONTEXT + off * 4] + +#endif -diff --git a/sysdeps/unix/sysv/linux/arc/ucontext_i.sym b/sysdeps/unix/sysv/linux/arc/ucontext_i.sym -new file mode 100644 -index 0000000000..d84e92f9f5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/ucontext_i.sym @@ -0,0 +1,20 @@ @@ -8249,9 +7954,6 @@ index 0000000000..d84e92f9f5 +UCONTEXT_MCONTEXT ucontext (uc_mcontext) +UCONTEXT_SIGMASK ucontext (uc_sigmask) +UCONTEXT_SIZE sizeof (ucontext_t) -diff --git a/sysdeps/unix/sysv/linux/arc/vfork.S b/sysdeps/unix/sysv/linux/arc/vfork.S -new file mode 100644 -index 0000000000..7f981d0681 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arc/vfork.S @@ -0,0 +1,42 @@ @@ -8297,11 +7999,9 @@ index 0000000000..7f981d0681 +libc_hidden_def (__vfork) + +weak_alias (__vfork, vfork) -diff --git a/sysdeps/unix/sysv/linux/syscall-names.list b/sysdeps/unix/sysv/linux/syscall-names.list -index 36e087d8f4..60ecb263db 100644 --- a/sysdeps/unix/sysv/linux/syscall-names.list +++ b/sysdeps/unix/sysv/linux/syscall-names.list -@@ -41,6 +41,9 @@ adjtimex +@@ -41,6 +41,9 @@ afs_syscall alarm alloc_hugepages @@ -8311,11 +8011,9 @@ index 36e087d8f4..60ecb263db 100644 arch_prctl arm_fadvise64_64 arm_sync_file_range -diff --git a/timezone/zic.c b/timezone/zic.c -index 2ebc66a9af..8e8d94fac3 100644 --- a/timezone/zic.c +++ b/timezone/zic.c -@@ -39,7 +39,7 @@ typedef int_fast64_t zic_t; +@@ -39,7 +39,7 @@ #include #endif #ifdef S_IRUSR @@ -8324,6 +8022,3 @@ index 2ebc66a9af..8e8d94fac3 100644 #else #define MKDIR_UMASK 0755 #endif --- -2.20.1 - diff --git a/packages/glibc/2.31/0002-Fix-build-with-GCC-10-when-long-double-double.patch b/packages/glibc/2.31/0002-Fix-build-with-GCC-10-when-long-double-double.patch index ca0d8a7..5ec96fe 100644 --- a/packages/glibc/2.31/0002-Fix-build-with-GCC-10-when-long-double-double.patch +++ b/packages/glibc/2.31/0002-Fix-build-with-GCC-10-when-long-double-double.patch @@ -25,14 +25,12 @@ irrelevant for other reasons). Tested with build-many-glibcs.py for arm-linux-gnueabi (compilers and glibcs builds), where it fixes the build that previously failed. --- - math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++ + math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) -diff --git a/math/Makefile b/math/Makefile -index 84a8b94c74..0a5a40430e 100644 --- a/math/Makefile +++ b/math/Makefile -@@ -650,6 +650,128 @@ ifneq ($(long-double-fcts),yes) +@@ -644,6 +644,128 @@ # We won't compile the `long double' code at all. Tell the `double' code # to define aliases for the `FUNCl' names. math-CPPFLAGS += -DNO_LONG_DOUBLE @@ -161,6 +159,3 @@ index 84a8b94c74..0a5a40430e 100644 endif # These files quiet sNaNs in a way that is optimized away without --- -2.25.1 - diff --git a/packages/glibc/2.32/0000-typedef-caddr.patch b/packages/glibc/2.32/0000-typedef-caddr.patch index 451884c..a328da1 100644 --- a/packages/glibc/2.32/0000-typedef-caddr.patch +++ b/packages/glibc/2.32/0000-typedef-caddr.patch @@ -4,7 +4,7 @@ --- a/posix/sys/types.h +++ b/posix/sys/types.h -@@ -112,7 +112,10 @@ typedef __ssize_t ssize_t; +@@ -112,7 +112,10 @@ #ifdef __USE_MISC # ifndef __daddr_t_defined typedef __daddr_t daddr_t; diff --git a/packages/glibc/2.32/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch b/packages/glibc/2.32/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch index e02e69b..6b18501 100644 --- a/packages/glibc/2.32/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch +++ b/packages/glibc/2.32/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch @@ -8,11 +8,9 @@ the expected "stable" by the release manager. This is a mistake that leads to the build using "-g -O1" instead of "-g -O2" if configure was executed with "CFLAGS=" (CFLAGS set but empty). --- - version.h | 2 +- + version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/version.h b/version.h -index 83cd196798..e6ca7a8857 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ @@ -21,6 +19,3 @@ index 83cd196798..e6ca7a8857 100644 -#define RELEASE "release" +#define RELEASE "stable" #define VERSION "2.32" --- -2.25.1 - diff --git a/packages/glibc/2.32/0002-Add-ARC700-support.patch b/packages/glibc/2.32/0002-Add-ARC700-support.patch index 23c94a7..22ae16c 100644 --- a/packages/glibc/2.32/0002-Add-ARC700-support.patch +++ b/packages/glibc/2.32/0002-Add-ARC700-support.patch @@ -11,16 +11,14 @@ pieces. I looked at uClibc-ng and a patch by Synopsis for glibc. Signed-off-by: Rosen Penev Signed-off-by: Alexey Brodkin --- - sysdeps/arc/atomic-machine.h | 4 ++++ - sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ - sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ + sysdeps/arc/atomic-machine.h | 4 ++++ + sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ + sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ 3 files changed, 17 insertions(+) -diff --git a/sysdeps/arc/atomic-machine.h b/sysdeps/arc/atomic-machine.h -index 1c8638bb44..bde66ae137 100644 --- a/sysdeps/arc/atomic-machine.h +++ b/sysdeps/arc/atomic-machine.h -@@ -64,6 +64,10 @@ typedef uintmax_t uatomic_max_t; +@@ -64,6 +64,10 @@ __atomic_val_bysize (__arch_compare_and_exchange_val, int, \ mem, new, old, __ATOMIC_ACQUIRE) @@ -31,11 +29,9 @@ index 1c8638bb44..bde66ae137 100644 +#endif #endif /* _ARC_BITS_ATOMIC_H */ -diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S -index 6227dbf499..0609dbeeba 100644 --- a/sysdeps/unix/sysv/linux/arc/syscall.S +++ b/sysdeps/unix/sysv/linux/arc/syscall.S -@@ -24,8 +24,13 @@ ENTRY (syscall) +@@ -24,8 +24,13 @@ mov_s r1, r2 mov_s r2, r3 mov_s r3, r4 @@ -49,11 +45,9 @@ index 6227dbf499..0609dbeeba 100644 ARC_TRAP_INSN brhi r0, -4096, L (call_syscall_err) -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h -index 8465a2f623..3faff27b1c 100644 --- a/sysdeps/unix/sysv/linux/arc/sysdep.h +++ b/sysdeps/unix/sysv/linux/arc/sysdep.h -@@ -128,7 +128,11 @@ L (call_syscall_err): ASM_LINE_SEP \ +@@ -128,7 +128,11 @@ mov r8, __NR_##syscall_name ASM_LINE_SEP \ ARC_TRAP_INSN ASM_LINE_SEP @@ -65,7 +59,7 @@ index 8465a2f623..3faff27b1c 100644 #else /* !__ASSEMBLER__ */ -@@ -139,7 +143,11 @@ extern long int __syscall_error (long int); +@@ -139,7 +143,11 @@ hidden_proto (__syscall_error) # endif @@ -77,6 +71,3 @@ index 8465a2f623..3faff27b1c 100644 # undef INTERNAL_SYSCALL_NCS # define INTERNAL_SYSCALL_NCS(number, nr_args, args...) \ --- -2.16.2 - diff --git a/packages/glibc/2.33/0000-typedef-caddr.patch b/packages/glibc/2.33/0000-typedef-caddr.patch index 451884c..a328da1 100644 --- a/packages/glibc/2.33/0000-typedef-caddr.patch +++ b/packages/glibc/2.33/0000-typedef-caddr.patch @@ -4,7 +4,7 @@ --- a/posix/sys/types.h +++ b/posix/sys/types.h -@@ -112,7 +112,10 @@ typedef __ssize_t ssize_t; +@@ -112,7 +112,10 @@ #ifdef __USE_MISC # ifndef __daddr_t_defined typedef __daddr_t daddr_t; diff --git a/packages/glibc/2.33/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch b/packages/glibc/2.33/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch index 9c4b0e4..c3c13d2 100644 --- a/packages/glibc/2.33/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch +++ b/packages/glibc/2.33/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch @@ -8,7 +8,7 @@ the expected "stable" by the release manager. This is a mistake that leads to the build using "-g -O1" instead of "-g -O2" if configure was executed with "CFLAGS=" (CFLAGS set but empty). --- - version.h | 2 +- + version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/version.h diff --git a/packages/glibc/2.33/0002-Add-ARC700-support.patch b/packages/glibc/2.33/0002-Add-ARC700-support.patch index 23c94a7..22ae16c 100644 --- a/packages/glibc/2.33/0002-Add-ARC700-support.patch +++ b/packages/glibc/2.33/0002-Add-ARC700-support.patch @@ -11,16 +11,14 @@ pieces. I looked at uClibc-ng and a patch by Synopsis for glibc. Signed-off-by: Rosen Penev Signed-off-by: Alexey Brodkin --- - sysdeps/arc/atomic-machine.h | 4 ++++ - sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ - sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ + sysdeps/arc/atomic-machine.h | 4 ++++ + sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ + sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ 3 files changed, 17 insertions(+) -diff --git a/sysdeps/arc/atomic-machine.h b/sysdeps/arc/atomic-machine.h -index 1c8638bb44..bde66ae137 100644 --- a/sysdeps/arc/atomic-machine.h +++ b/sysdeps/arc/atomic-machine.h -@@ -64,6 +64,10 @@ typedef uintmax_t uatomic_max_t; +@@ -64,6 +64,10 @@ __atomic_val_bysize (__arch_compare_and_exchange_val, int, \ mem, new, old, __ATOMIC_ACQUIRE) @@ -31,11 +29,9 @@ index 1c8638bb44..bde66ae137 100644 +#endif #endif /* _ARC_BITS_ATOMIC_H */ -diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S -index 6227dbf499..0609dbeeba 100644 --- a/sysdeps/unix/sysv/linux/arc/syscall.S +++ b/sysdeps/unix/sysv/linux/arc/syscall.S -@@ -24,8 +24,13 @@ ENTRY (syscall) +@@ -24,8 +24,13 @@ mov_s r1, r2 mov_s r2, r3 mov_s r3, r4 @@ -49,11 +45,9 @@ index 6227dbf499..0609dbeeba 100644 ARC_TRAP_INSN brhi r0, -4096, L (call_syscall_err) -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h -index 8465a2f623..3faff27b1c 100644 --- a/sysdeps/unix/sysv/linux/arc/sysdep.h +++ b/sysdeps/unix/sysv/linux/arc/sysdep.h -@@ -128,7 +128,11 @@ L (call_syscall_err): ASM_LINE_SEP \ +@@ -128,7 +128,11 @@ mov r8, __NR_##syscall_name ASM_LINE_SEP \ ARC_TRAP_INSN ASM_LINE_SEP @@ -65,7 +59,7 @@ index 8465a2f623..3faff27b1c 100644 #else /* !__ASSEMBLER__ */ -@@ -139,7 +143,11 @@ extern long int __syscall_error (long int); +@@ -139,7 +143,11 @@ hidden_proto (__syscall_error) # endif @@ -77,6 +71,3 @@ index 8465a2f623..3faff27b1c 100644 # undef INTERNAL_SYSCALL_NCS # define INTERNAL_SYSCALL_NCS(number, nr_args, args...) \ --- -2.16.2 - diff --git a/packages/glibc/2.34/0000-typedef-caddr.patch b/packages/glibc/2.34/0000-typedef-caddr.patch index 451884c..a328da1 100644 --- a/packages/glibc/2.34/0000-typedef-caddr.patch +++ b/packages/glibc/2.34/0000-typedef-caddr.patch @@ -4,7 +4,7 @@ --- a/posix/sys/types.h +++ b/posix/sys/types.h -@@ -112,7 +112,10 @@ typedef __ssize_t ssize_t; +@@ -112,7 +112,10 @@ #ifdef __USE_MISC # ifndef __daddr_t_defined typedef __daddr_t daddr_t; diff --git a/packages/glibc/2.34/0001-Add-ARC700-support.patch b/packages/glibc/2.34/0001-Add-ARC700-support.patch index 23c94a7..22ae16c 100644 --- a/packages/glibc/2.34/0001-Add-ARC700-support.patch +++ b/packages/glibc/2.34/0001-Add-ARC700-support.patch @@ -11,16 +11,14 @@ pieces. I looked at uClibc-ng and a patch by Synopsis for glibc. Signed-off-by: Rosen Penev Signed-off-by: Alexey Brodkin --- - sysdeps/arc/atomic-machine.h | 4 ++++ - sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ - sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ + sysdeps/arc/atomic-machine.h | 4 ++++ + sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ + sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ 3 files changed, 17 insertions(+) -diff --git a/sysdeps/arc/atomic-machine.h b/sysdeps/arc/atomic-machine.h -index 1c8638bb44..bde66ae137 100644 --- a/sysdeps/arc/atomic-machine.h +++ b/sysdeps/arc/atomic-machine.h -@@ -64,6 +64,10 @@ typedef uintmax_t uatomic_max_t; +@@ -64,6 +64,10 @@ __atomic_val_bysize (__arch_compare_and_exchange_val, int, \ mem, new, old, __ATOMIC_ACQUIRE) @@ -31,11 +29,9 @@ index 1c8638bb44..bde66ae137 100644 +#endif #endif /* _ARC_BITS_ATOMIC_H */ -diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S -index 6227dbf499..0609dbeeba 100644 --- a/sysdeps/unix/sysv/linux/arc/syscall.S +++ b/sysdeps/unix/sysv/linux/arc/syscall.S -@@ -24,8 +24,13 @@ ENTRY (syscall) +@@ -24,8 +24,13 @@ mov_s r1, r2 mov_s r2, r3 mov_s r3, r4 @@ -49,11 +45,9 @@ index 6227dbf499..0609dbeeba 100644 ARC_TRAP_INSN brhi r0, -4096, L (call_syscall_err) -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h -index 8465a2f623..3faff27b1c 100644 --- a/sysdeps/unix/sysv/linux/arc/sysdep.h +++ b/sysdeps/unix/sysv/linux/arc/sysdep.h -@@ -128,7 +128,11 @@ L (call_syscall_err): ASM_LINE_SEP \ +@@ -128,7 +128,11 @@ mov r8, __NR_##syscall_name ASM_LINE_SEP \ ARC_TRAP_INSN ASM_LINE_SEP @@ -65,7 +59,7 @@ index 8465a2f623..3faff27b1c 100644 #else /* !__ASSEMBLER__ */ -@@ -139,7 +143,11 @@ extern long int __syscall_error (long int); +@@ -139,7 +143,11 @@ hidden_proto (__syscall_error) # endif @@ -77,6 +71,3 @@ index 8465a2f623..3faff27b1c 100644 # undef INTERNAL_SYSCALL_NCS # define INTERNAL_SYSCALL_NCS(number, nr_args, args...) \ --- -2.16.2 - diff --git a/packages/glibc/2.35/0000-typedef-caddr.patch b/packages/glibc/2.35/0000-typedef-caddr.patch index 451884c..a328da1 100644 --- a/packages/glibc/2.35/0000-typedef-caddr.patch +++ b/packages/glibc/2.35/0000-typedef-caddr.patch @@ -4,7 +4,7 @@ --- a/posix/sys/types.h +++ b/posix/sys/types.h -@@ -112,7 +112,10 @@ typedef __ssize_t ssize_t; +@@ -112,7 +112,10 @@ #ifdef __USE_MISC # ifndef __daddr_t_defined typedef __daddr_t daddr_t; diff --git a/packages/glibc/2.35/0001-Add-ARC700-support.patch b/packages/glibc/2.35/0001-Add-ARC700-support.patch index 23c94a7..54729d8 100644 --- a/packages/glibc/2.35/0001-Add-ARC700-support.patch +++ b/packages/glibc/2.35/0001-Add-ARC700-support.patch @@ -11,16 +11,14 @@ pieces. I looked at uClibc-ng and a patch by Synopsis for glibc. Signed-off-by: Rosen Penev Signed-off-by: Alexey Brodkin --- - sysdeps/arc/atomic-machine.h | 4 ++++ - sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ - sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ + sysdeps/arc/atomic-machine.h | 4 ++++ + sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++ + sysdeps/unix/sysv/linux/arc/sysdep.h | 8 ++++++++ 3 files changed, 17 insertions(+) -diff --git a/sysdeps/arc/atomic-machine.h b/sysdeps/arc/atomic-machine.h -index 1c8638bb44..bde66ae137 100644 --- a/sysdeps/arc/atomic-machine.h +++ b/sysdeps/arc/atomic-machine.h -@@ -64,6 +64,10 @@ typedef uintmax_t uatomic_max_t; +@@ -52,6 +52,10 @@ __atomic_val_bysize (__arch_compare_and_exchange_val, int, \ mem, new, old, __ATOMIC_ACQUIRE) @@ -31,11 +29,9 @@ index 1c8638bb44..bde66ae137 100644 +#endif #endif /* _ARC_BITS_ATOMIC_H */ -diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S -index 6227dbf499..0609dbeeba 100644 --- a/sysdeps/unix/sysv/linux/arc/syscall.S +++ b/sysdeps/unix/sysv/linux/arc/syscall.S -@@ -24,8 +24,13 @@ ENTRY (syscall) +@@ -24,8 +24,13 @@ mov_s r1, r2 mov_s r2, r3 mov_s r3, r4 @@ -49,11 +45,9 @@ index 6227dbf499..0609dbeeba 100644 ARC_TRAP_INSN brhi r0, -4096, L (call_syscall_err) -diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h -index 8465a2f623..3faff27b1c 100644 --- a/sysdeps/unix/sysv/linux/arc/sysdep.h +++ b/sysdeps/unix/sysv/linux/arc/sysdep.h -@@ -128,7 +128,11 @@ L (call_syscall_err): ASM_LINE_SEP \ +@@ -128,7 +128,11 @@ mov r8, __NR_##syscall_name ASM_LINE_SEP \ ARC_TRAP_INSN ASM_LINE_SEP @@ -65,7 +59,7 @@ index 8465a2f623..3faff27b1c 100644 #else /* !__ASSEMBLER__ */ -@@ -139,7 +143,11 @@ extern long int __syscall_error (long int); +@@ -139,7 +143,11 @@ hidden_proto (__syscall_error) # endif @@ -77,6 +71,3 @@ index 8465a2f623..3faff27b1c 100644 # undef INTERNAL_SYSCALL_NCS # define INTERNAL_SYSCALL_NCS(number, nr_args, args...) \ --- -2.16.2 - diff --git a/packages/glibc/2.35/0002-linux-Fix-missing-__convert_scm_timestamps-BZ-28860.patch b/packages/glibc/2.35/0002-linux-Fix-missing-__convert_scm_timestamps-BZ-28860.patch index 30cd1c4..71609df 100644 --- a/packages/glibc/2.35/0002-linux-Fix-missing-__convert_scm_timestamps-BZ-28860.patch +++ b/packages/glibc/2.35/0002-linux-Fix-missing-__convert_scm_timestamps-BZ-28860.patch @@ -10,11 +10,9 @@ always build it for __TIMESIZE != 64. It fixes build for architecture with 32 bit time_t support when configured with minimum kernel of 5.1. --- - sysdeps/unix/sysv/linux/convert_scm_timestamps.c | 4 ++-- + sysdeps/unix/sysv/linux/convert_scm_timestamps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c -index 82171bf325..dfc8c2beff 100644 --- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c +++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c @@ -16,9 +16,9 @@ @@ -29,6 +27,3 @@ index 82171bf325..dfc8c2beff 100644 # include # include # include --- -2.35.1 - diff --git a/packages/gmp/6.2.1/0000-Avoid-the-x18-register.patch b/packages/gmp/6.2.1/0000-Avoid-the-x18-register.patch index 5c1c232..02f1fd7 100644 --- a/packages/gmp/6.2.1/0000-Avoid-the-x18-register.patch +++ b/packages/gmp/6.2.1/0000-Avoid-the-x18-register.patch @@ -6,9 +6,22 @@ # Parent 63bce6cacb48d9a1ade560db5f6e5da073969a09 Avoid the x18 register since it is reserved on Darwin. -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/aors_n.asm ---- a/mpn/arm64/aors_n.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/aors_n.asm Sun Nov 29 23:07:23 2020 +0100 +--- + mpn/arm64/aors_n.asm | 12 ++++++------ + mpn/arm64/aorsmul_1.asm | 13 +++++++++---- + mpn/arm64/aorsorrlshC_n.asm | 12 ++++++------ + mpn/arm64/cnd_aors_n.asm | 12 ++++++------ + mpn/arm64/logops_n.asm | 12 ++++++------ + mpn/arm64/lshift.asm | 10 +++++----- + mpn/arm64/lshiftc.asm | 10 +++++----- + mpn/arm64/mul_1.asm | 14 +++++++------- + mpn/arm64/rsh1aors_n.asm | 20 ++++++++++---------- + mpn/arm64/rshift.asm | 10 +++++----- + mpn/arm64/sqr_diag_addlsh1.asm | 10 +++++----- + 11 files changed, 70 insertions(+), 65 deletions(-) + +--- a/mpn/arm64/aors_n.asm ++++ b/mpn/arm64/aors_n.asm @@ -68,7 +68,7 @@ EPILOGUE() PROLOGUE(func_n) @@ -56,9 +69,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/aors_n.asm L(end): ADDSUBC x12, x6, x10 ADDSUBC x13, x7, x11 -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/aorsmul_1.asm ---- a/mpn/arm64/aorsmul_1.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/aorsmul_1.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/aorsmul_1.asm ++++ b/mpn/arm64/aorsmul_1.asm @@ -32,10 +32,15 @@ include(`../config.m4') @@ -79,9 +91,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/aorsmul_1.asm C NOTES C * It is possible to keep the carry chain alive between the addition blocks -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/aorsorrlshC_n.asm ---- a/mpn/arm64/aorsorrlshC_n.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/aorsorrlshC_n.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/aorsorrlshC_n.asm ++++ b/mpn/arm64/aorsorrlshC_n.asm @@ -65,14 +65,14 @@ ASM_START() @@ -128,9 +139,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/aorsorrlshC_n.asm L(end): ldp x4, x5, [up,#16] extr x12, x10, x9, #RSH -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/cnd_aors_n.asm ---- a/mpn/arm64/cnd_aors_n.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/cnd_aors_n.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/cnd_aors_n.asm ++++ b/mpn/arm64/cnd_aors_n.asm @@ -65,7 +65,7 @@ CLRCY @@ -178,9 +188,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/cnd_aors_n.asm L(end): bic x6, x12, cnd bic x7, x13, cnd -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/logops_n.asm ---- a/mpn/arm64/logops_n.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/logops_n.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/logops_n.asm ++++ b/mpn/arm64/logops_n.asm @@ -78,7 +78,7 @@ ASM_START() @@ -228,9 +237,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/logops_n.asm L(end): LOGOP( x12, x6, x10) LOGOP( x13, x7, x11) -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/lshift.asm ---- a/mpn/arm64/lshift.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/lshift.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/lshift.asm ++++ b/mpn/arm64/lshift.asm @@ -61,7 +61,7 @@ add rp, rp_arg, n, lsl #3 add up, up, n, lsl #3 @@ -272,9 +280,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/lshift.asm L(end): orr x10, x10, x13 orr x11, x12, x2 -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/lshiftc.asm ---- a/mpn/arm64/lshiftc.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/lshiftc.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/lshiftc.asm ++++ b/mpn/arm64/lshiftc.asm @@ -61,7 +61,7 @@ add rp, rp_arg, n, lsl #3 add up, up, n, lsl #3 @@ -316,9 +323,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/lshiftc.asm L(end): eon x10, x10, x13 eon x11, x12, x2 -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/mul_1.asm ---- a/mpn/arm64/mul_1.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/mul_1.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/mul_1.asm ++++ b/mpn/arm64/mul_1.asm @@ -56,7 +56,7 @@ PROLOGUE(mpn_mul_1) @@ -368,9 +374,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/mul_1.asm L(end): mul x8, x4, v0 adcs x13, x9, x10 -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/rsh1aors_n.asm ---- a/mpn/arm64/rsh1aors_n.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/rsh1aors_n.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/rsh1aors_n.asm ++++ b/mpn/arm64/rsh1aors_n.asm @@ -59,7 +59,7 @@ ASM_START() @@ -440,9 +445,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/rsh1aors_n.asm L(end): extr x16, x15, x14, #1 extr x17, x12, x15, #1 -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/rshift.asm ---- a/mpn/arm64/rshift.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/rshift.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/rshift.asm ++++ b/mpn/arm64/rshift.asm @@ -60,7 +60,7 @@ PROLOGUE(mpn_rshift) mov rp, rp_arg @@ -484,9 +488,8 @@ diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/rshift.asm L(end): orr x10, x10, x13 orr x11, x12, x2 -diff -r 63bce6cacb48 -r f4ff6ff711ed mpn/arm64/sqr_diag_addlsh1.asm ---- a/mpn/arm64/sqr_diag_addlsh1.asm Sun Nov 15 10:25:36 2020 +0100 -+++ b/mpn/arm64/sqr_diag_addlsh1.asm Sun Nov 29 23:07:23 2020 +0100 +--- a/mpn/arm64/sqr_diag_addlsh1.asm ++++ b/mpn/arm64/sqr_diag_addlsh1.asm @@ -47,7 +47,7 @@ ASM_START() PROLOGUE(mpn_sqr_diag_addlsh1) diff --git a/packages/gnuprumcu/0.5.0/0000-HACK-Fix-paths-for-crosstool-ng.patch b/packages/gnuprumcu/0.5.0/0000-HACK-Fix-paths-for-crosstool-ng.patch new file mode 100644 index 0000000..f60280c --- /dev/null +++ b/packages/gnuprumcu/0.5.0/0000-HACK-Fix-paths-for-crosstool-ng.patch @@ -0,0 +1,34 @@ +From b045b2c65e26153813abadc2d065afdd52612fb0 Mon Sep 17 00:00:00 2001 +From: Dimitar Dimitrov +Date: Fri, 15 Jan 2021 18:52:09 +0200 +Subject: [PATCH] HACK: Fix paths for crosstool-ng + +For some reason crosstool-ng modifies the default +binutils/ld path for ldscripts. Align our respective +path. + +Signed-off-by: Dimitar Dimitrov +--- + ldscripts/Makefile.am | 2 +- + ldscripts/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/ldscripts/Makefile.am ++++ b/ldscripts/Makefile.am +@@ -47,4 +47,4 @@ + pruelf-tda4vm.icssg1.tx_pru1.x + + +-prudir = $(exec_prefix)/$(target_alias)/lib ++prudir = $(libdir) +--- a/ldscripts/Makefile.in ++++ b/ldscripts/Makefile.in +@@ -300,7 +300,7 @@ + pruelf-tda4vm.icssg1.tx_pru0.x \ + pruelf-tda4vm.icssg1.tx_pru1.x + +-prudir = $(exec_prefix)/$(target_alias)/lib ++prudir = $(libdir) + all: all-am + + .SUFFIXES: diff --git a/packages/gnuprumcu/0.5.0/0001-HACK-Fix-paths-for-crosstool-ng.patch b/packages/gnuprumcu/0.5.0/0001-HACK-Fix-paths-for-crosstool-ng.patch deleted file mode 100644 index e251180..0000000 --- a/packages/gnuprumcu/0.5.0/0001-HACK-Fix-paths-for-crosstool-ng.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b045b2c65e26153813abadc2d065afdd52612fb0 Mon Sep 17 00:00:00 2001 -From: Dimitar Dimitrov -Date: Fri, 15 Jan 2021 18:52:09 +0200 -Subject: [PATCH] HACK: Fix paths for crosstool-ng - -For some reason crosstool-ng modifies the default -binutils/ld path for ldscripts. Align our respective -path. - -Signed-off-by: Dimitar Dimitrov ---- - ldscripts/Makefile.am | 2 +- - ldscripts/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ldscripts/Makefile.am b/ldscripts/Makefile.am -index 23c5903..b6984d5 100644 ---- a/ldscripts/Makefile.am -+++ b/ldscripts/Makefile.am -@@ -47,4 +47,4 @@ dist_pru_DATA = \ - pruelf-tda4vm.icssg1.tx_pru1.x - - --prudir = $(exec_prefix)/$(target_alias)/lib -+prudir = $(libdir) -diff --git a/ldscripts/Makefile.in b/ldscripts/Makefile.in -index b58975f..b7aecd2 100644 ---- a/ldscripts/Makefile.in -+++ b/ldscripts/Makefile.in -@@ -300,7 +300,7 @@ dist_pru_DATA = \ - pruelf-tda4vm.icssg1.tx_pru0.x \ - pruelf-tda4vm.icssg1.tx_pru1.x - --prudir = $(exec_prefix)/$(target_alias)/lib -+prudir = $(libdir) - all: all-am - - .SUFFIXES: --- -2.20.1 - diff --git a/packages/ltrace/0.7.3/0008-mips-printf-format.patch b/packages/ltrace/0.7.3/0008-mips-printf-format.patch index 6875392..c5568e2 100644 --- a/packages/ltrace/0.7.3/0008-mips-printf-format.patch +++ b/packages/ltrace/0.7.3/0008-mips-printf-format.patch @@ -1,6 +1,9 @@ -diff -Naur ltrace-0.7.3-orig/sysdeps/linux-gnu/mips/plt.c ltrace-0.7.3/sysdeps/linux-gnu/mips/plt.c ---- ltrace-0.7.3-orig/sysdeps/linux-gnu/mips/plt.c 2013-09-17 11:04:28.000000000 +1200 -+++ ltrace-0.7.3/sysdeps/linux-gnu/mips/plt.c 2021-04-14 22:05:45.950413823 +1200 +--- + sysdeps/linux-gnu/mips/plt.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sysdeps/linux-gnu/mips/plt.c ++++ b/sysdeps/linux-gnu/mips/plt.c @@ -356,8 +356,8 @@ name = strdup(a_name); diff --git a/packages/mingw-w64/v8.0.2/0000-mingw64-malloc.patch b/packages/mingw-w64/v8.0.2/0000-mingw64-malloc.patch index 835be63..8e0add1 100644 --- a/packages/mingw-w64/v8.0.2/0000-mingw64-malloc.patch +++ b/packages/mingw-w64/v8.0.2/0000-mingw64-malloc.patch @@ -1,7 +1,7 @@ --- mingw-w64-tools/genidl/src/genidl_cfg.h | 2 ++ mingw-w64-tools/genidl/src/genidl_typinfo.c | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 files changed, 5 insertions(+) --- a/mingw-w64-tools/genidl/src/genidl_cfg.h +++ b/mingw-w64-tools/genidl/src/genidl_cfg.h @@ -27,3 +27,4 @@ +#include #include #include + diff --git a/packages/mingw-w64/v9.0.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v9.0.0/0000-mingw64-malloc.patch index 835be63..8e0add1 100644 --- a/packages/mingw-w64/v9.0.0/0000-mingw64-malloc.patch +++ b/packages/mingw-w64/v9.0.0/0000-mingw64-malloc.patch @@ -1,7 +1,7 @@ --- mingw-w64-tools/genidl/src/genidl_cfg.h | 2 ++ mingw-w64-tools/genidl/src/genidl_typinfo.c | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 files changed, 5 insertions(+) --- a/mingw-w64-tools/genidl/src/genidl_cfg.h +++ b/mingw-w64-tools/genidl/src/genidl_cfg.h @@ -27,3 +27,4 @@ +#include #include #include + diff --git a/packages/picolibc/1.4.7/0000-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch b/packages/picolibc/1.4.7/0000-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch new file mode 100644 index 0000000..4b3ecbd --- /dev/null +++ b/packages/picolibc/1.4.7/0000-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch @@ -0,0 +1,150 @@ +From 2adb30bd8e64bf06fb5366585e305c28c4325e01 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Tue, 3 Nov 2020 16:36:48 -0800 +Subject: [PATCH] tinystdio: Make ungetc buffer type purely + architecture-specific + +Instead of attempting to figure out what type this object should be +based on compiler support for atomics, just make it 32-bits on RISC-V +when using atomic ungetc, otherwise make it 16-bits, then select +whether there are 'real' atomics based on compiler support for the +chosen type, which may depend on the compiler options used to build +the library. + +This ensures that the picolibc ABI is consistent for each +architecture. + +This also removes the use of stdatomic.h from stdio.h, which isn't +supported by C++. + +Signed-off-by: Keith Packard +--- + newlib/libc/tinystdio/exchange.c | 2 - + newlib/libc/tinystdio/stdio.h | 39 +++++++++++++--------------------- + newlib/libc/tinystdio/stdio_private.h | 24 ++++++++++++++------ + 3 files changed, 34 insertions(+), 31 deletions(-) + +--- a/newlib/libc/tinystdio/exchange.c ++++ b/newlib/libc/tinystdio/exchange.c +@@ -39,7 +39,7 @@ + #if defined(ATOMIC_UNGETC) && !defined(PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP) + + __ungetc_t +-__picolibc_non_atomic_exchange_ungetc(__ungetc_store_t *p, __ungetc_t v) ++__picolibc_non_atomic_exchange_ungetc(__ungetc_t *p, __ungetc_t v) + { + return __non_atomic_exchange_ungetc(p, v); + } +--- a/newlib/libc/tinystdio/stdio.h ++++ b/newlib/libc/tinystdio/stdio.h +@@ -224,38 +224,31 @@ + * elements of it beyond by using the official interfaces provided. + */ + +-/* Use 32-bit ungetc storage when doing atomic ungetc and when +- * the platform has 4-byte swap intrinsics but not 2-byte swap +- * intrinsics, as is the case for RISC-V processors. This increases +- * the size of the __file struct by four bytes. +- */ +- + #ifdef ATOMIC_UNGETC +-#include +-# ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 +- +-# define PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP +-typedef atomic_uint_least32_t __ungetc_store_t; +-typedef uint_least32_t __ungetc_t; +- +-# else +-# ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 ++#ifdef __riscv ++/* ++ * Use 32-bit ungetc storage when doing atomic ungetc on RISC-V, which ++ * has 4-byte swap intrinsics but not 2-byte swap intrinsics. This ++ * increases the size of the __file struct by four bytes. ++ */ ++#define __PICOLIBC_UNGETC_SIZE 4 ++#endif ++#endif + +-# define PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP +-typedef atomic_uint_least16_t __ungetc_store_t; +-typedef uint_least16_t __ungetc_t; ++#ifndef __PICOLIBC_UNGETC_SIZE ++#define __PICOLIBC_UNGETC_SIZE 2 ++#endif + +-# endif +-# endif ++#if __PICOLIBC_UNGETC_SIZE == 4 ++typedef uint32_t __ungetc_t; + #endif + +-#ifndef PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP +-typedef uint16_t __ungetc_store_t; ++#if __PICOLIBC_UNGETC_SIZE == 2 + typedef uint16_t __ungetc_t; + #endif + + struct __file { +- __ungetc_store_t unget; /* ungetc() buffer */ ++ __ungetc_t unget; /* ungetc() buffer */ + uint8_t flags; /* flags, see below */ + #define __SRD 0x0001 /* OK to read */ + #define __SWR 0x0002 /* OK to write */ +--- a/newlib/libc/tinystdio/stdio_private.h ++++ b/newlib/libc/tinystdio/stdio_private.h +@@ -141,7 +141,7 @@ + __atof_engine(uint32_t m10, int e10); + + static inline uint16_t +-__non_atomic_exchange_ungetc(__ungetc_store_t *p, __ungetc_t v) ++__non_atomic_exchange_ungetc(__ungetc_t *p, __ungetc_t v) + { + __ungetc_t e = *p; + *p = v; +@@ -159,28 +159,38 @@ + + #ifdef ATOMIC_UNGETC + ++#if __PICOLIBC_UNGETC_SIZE == 4 && defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) ++#define PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP ++#endif ++ ++#if __PICOLIBC_UNGETC_SIZE == 2 && defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2) ++#define PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP ++#endif ++ + #ifdef PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP + + /* Use built-in atomic functions if they exist */ + #include + static inline bool +-__atomic_compare_exchange_ungetc(__ungetc_store_t *p, __ungetc_t d, __ungetc_t v) ++__atomic_compare_exchange_ungetc(__ungetc_t *p, __ungetc_t d, __ungetc_t v) + { +- return atomic_compare_exchange_weak(p, &d, v); ++ _Atomic __ungetc_t *pa = (_Atomic __ungetc_t *) p; ++ return atomic_compare_exchange_weak(pa, &d, v); + } + static inline __ungetc_t +-__atomic_exchange_ungetc(__ungetc_store_t *p, __ungetc_t v) ++__atomic_exchange_ungetc(__ungetc_t *p, __ungetc_t v) + { +- return atomic_exchange_explicit(p, v, memory_order_relaxed); ++ _Atomic __ungetc_t *pa = (_Atomic __ungetc_t *) p; ++ return atomic_exchange_explicit(pa, v, memory_order_relaxed); + } + + #else + + bool +-__atomic_compare_exchange_ungetc(__ungetc_store_t *p, __ungetc_t d, __ungetc_t v); ++__atomic_compare_exchange_ungetc(__ungetc_t *p, __ungetc_t d, __ungetc_t v); + + __ungetc_t +-__atomic_exchange_ungetc(__ungetc_store_t *p, __ungetc_t v); ++__atomic_exchange_ungetc(__ungetc_t *p, __ungetc_t v); + + #endif /* PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP */ + diff --git a/packages/picolibc/1.4.7/0001-Add-ARM-exception-information-to-link-rules.patch b/packages/picolibc/1.4.7/0001-Add-ARM-exception-information-to-link-rules.patch new file mode 100644 index 0000000..233eafa --- /dev/null +++ b/packages/picolibc/1.4.7/0001-Add-ARM-exception-information-to-link-rules.patch @@ -0,0 +1,31 @@ +From 9c39c93d4897c9ee1659dd6df7433d097a84be4a Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Wed, 4 Nov 2020 17:36:14 -0800 +Subject: [PATCH] Add ARM exception information to link rules + +Place any ARM exeception information in ROM for C++ support. + +Signed-off-by: Keith Packard +--- + picolibc.ld | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/picolibc.ld ++++ b/picolibc.ld +@@ -94,6 +94,16 @@ + *(.got .got.*) + } >flash AT>flash :text + ++ .ARM.extab : { ++ *(.ARM.extab* .gnu.linkonce.armextab.*) ++ } >flash AT>flash :text ++ ++ PROVIDE (__exidx_start = .); ++ .ARM.exidx : { ++ *(.ARM.exidx*) ++ } >flash AT>flash :text ++ PROVIDE(__exidx_end = .); ++ + . = ALIGN(8); + + .preinit_array : { diff --git a/packages/picolibc/1.4.7/0001-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch b/packages/picolibc/1.4.7/0001-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch deleted file mode 100644 index 0bedf41..0000000 --- a/packages/picolibc/1.4.7/0001-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 2adb30bd8e64bf06fb5366585e305c28c4325e01 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Tue, 3 Nov 2020 16:36:48 -0800 -Subject: [PATCH] tinystdio: Make ungetc buffer type purely - architecture-specific - -Instead of attempting to figure out what type this object should be -based on compiler support for atomics, just make it 32-bits on RISC-V -when using atomic ungetc, otherwise make it 16-bits, then select -whether there are 'real' atomics based on compiler support for the -chosen type, which may depend on the compiler options used to build -the library. - -This ensures that the picolibc ABI is consistent for each -architecture. - -This also removes the use of stdatomic.h from stdio.h, which isn't -supported by C++. - -Signed-off-by: Keith Packard ---- - newlib/libc/tinystdio/exchange.c | 2 +- - newlib/libc/tinystdio/stdio.h | 39 +++++++++++---------------- - newlib/libc/tinystdio/stdio_private.h | 24 ++++++++++++----- - 3 files changed, 34 insertions(+), 31 deletions(-) - -diff --git a/newlib/libc/tinystdio/exchange.c b/newlib/libc/tinystdio/exchange.c -index 1272ae36e..e8c785f8a 100644 ---- a/newlib/libc/tinystdio/exchange.c -+++ b/newlib/libc/tinystdio/exchange.c -@@ -39,7 +39,7 @@ - #if defined(ATOMIC_UNGETC) && !defined(PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP) - - __ungetc_t --__picolibc_non_atomic_exchange_ungetc(__ungetc_store_t *p, __ungetc_t v) -+__picolibc_non_atomic_exchange_ungetc(__ungetc_t *p, __ungetc_t v) - { - return __non_atomic_exchange_ungetc(p, v); - } -diff --git a/newlib/libc/tinystdio/stdio.h b/newlib/libc/tinystdio/stdio.h -index 1e36f73e9..8bc0f8843 100644 ---- a/newlib/libc/tinystdio/stdio.h -+++ b/newlib/libc/tinystdio/stdio.h -@@ -224,38 +224,31 @@ - * elements of it beyond by using the official interfaces provided. - */ - --/* Use 32-bit ungetc storage when doing atomic ungetc and when -- * the platform has 4-byte swap intrinsics but not 2-byte swap -- * intrinsics, as is the case for RISC-V processors. This increases -- * the size of the __file struct by four bytes. -- */ -- - #ifdef ATOMIC_UNGETC --#include --# ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 -- --# define PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP --typedef atomic_uint_least32_t __ungetc_store_t; --typedef uint_least32_t __ungetc_t; -- --# else --# ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 -+#ifdef __riscv -+/* -+ * Use 32-bit ungetc storage when doing atomic ungetc on RISC-V, which -+ * has 4-byte swap intrinsics but not 2-byte swap intrinsics. This -+ * increases the size of the __file struct by four bytes. -+ */ -+#define __PICOLIBC_UNGETC_SIZE 4 -+#endif -+#endif - --# define PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP --typedef atomic_uint_least16_t __ungetc_store_t; --typedef uint_least16_t __ungetc_t; -+#ifndef __PICOLIBC_UNGETC_SIZE -+#define __PICOLIBC_UNGETC_SIZE 2 -+#endif - --# endif --# endif -+#if __PICOLIBC_UNGETC_SIZE == 4 -+typedef uint32_t __ungetc_t; - #endif - --#ifndef PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP --typedef uint16_t __ungetc_store_t; -+#if __PICOLIBC_UNGETC_SIZE == 2 - typedef uint16_t __ungetc_t; - #endif - - struct __file { -- __ungetc_store_t unget; /* ungetc() buffer */ -+ __ungetc_t unget; /* ungetc() buffer */ - uint8_t flags; /* flags, see below */ - #define __SRD 0x0001 /* OK to read */ - #define __SWR 0x0002 /* OK to write */ -diff --git a/newlib/libc/tinystdio/stdio_private.h b/newlib/libc/tinystdio/stdio_private.h -index b8ec66864..1a8b77dc9 100644 ---- a/newlib/libc/tinystdio/stdio_private.h -+++ b/newlib/libc/tinystdio/stdio_private.h -@@ -141,7 +141,7 @@ float - __atof_engine(uint32_t m10, int e10); - - static inline uint16_t --__non_atomic_exchange_ungetc(__ungetc_store_t *p, __ungetc_t v) -+__non_atomic_exchange_ungetc(__ungetc_t *p, __ungetc_t v) - { - __ungetc_t e = *p; - *p = v; -@@ -159,28 +159,38 @@ __non_atomic_compare_exchange_ungetc(__ungetc_t *p, __ungetc_t d, __ungetc_t v) - - #ifdef ATOMIC_UNGETC - -+#if __PICOLIBC_UNGETC_SIZE == 4 && defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) -+#define PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP -+#endif -+ -+#if __PICOLIBC_UNGETC_SIZE == 2 && defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2) -+#define PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP -+#endif -+ - #ifdef PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP - - /* Use built-in atomic functions if they exist */ - #include - static inline bool --__atomic_compare_exchange_ungetc(__ungetc_store_t *p, __ungetc_t d, __ungetc_t v) -+__atomic_compare_exchange_ungetc(__ungetc_t *p, __ungetc_t d, __ungetc_t v) - { -- return atomic_compare_exchange_weak(p, &d, v); -+ _Atomic __ungetc_t *pa = (_Atomic __ungetc_t *) p; -+ return atomic_compare_exchange_weak(pa, &d, v); - } - static inline __ungetc_t --__atomic_exchange_ungetc(__ungetc_store_t *p, __ungetc_t v) -+__atomic_exchange_ungetc(__ungetc_t *p, __ungetc_t v) - { -- return atomic_exchange_explicit(p, v, memory_order_relaxed); -+ _Atomic __ungetc_t *pa = (_Atomic __ungetc_t *) p; -+ return atomic_exchange_explicit(pa, v, memory_order_relaxed); - } - - #else - - bool --__atomic_compare_exchange_ungetc(__ungetc_store_t *p, __ungetc_t d, __ungetc_t v); -+__atomic_compare_exchange_ungetc(__ungetc_t *p, __ungetc_t d, __ungetc_t v); - - __ungetc_t --__atomic_exchange_ungetc(__ungetc_store_t *p, __ungetc_t v); -+__atomic_exchange_ungetc(__ungetc_t *p, __ungetc_t v); - - #endif /* PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP */ - --- -2.29.1 - diff --git a/packages/picolibc/1.4.7/0002-Add-ARM-exception-information-to-link-rules.patch b/packages/picolibc/1.4.7/0002-Add-ARM-exception-information-to-link-rules.patch deleted file mode 100644 index 7fd254d..0000000 --- a/packages/picolibc/1.4.7/0002-Add-ARM-exception-information-to-link-rules.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9c39c93d4897c9ee1659dd6df7433d097a84be4a Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Wed, 4 Nov 2020 17:36:14 -0800 -Subject: [PATCH] Add ARM exception information to link rules - -Place any ARM exeception information in ROM for C++ support. - -Signed-off-by: Keith Packard ---- - picolibc.ld | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/picolibc.ld b/picolibc.ld -index 6d14b396f..ff60fe3a3 100644 ---- a/picolibc.ld -+++ b/picolibc.ld -@@ -94,6 +94,16 @@ SECTIONS - *(.got .got.*) - } >flash AT>flash :text - -+ .ARM.extab : { -+ *(.ARM.extab* .gnu.linkonce.armextab.*) -+ } >flash AT>flash :text -+ -+ PROVIDE (__exidx_start = .); -+ .ARM.exidx : { -+ *(.ARM.exidx*) -+ } >flash AT>flash :text -+ PROVIDE(__exidx_end = .); -+ - . = ALIGN(8); - - .preinit_array : { --- -2.28.0 - diff --git a/packages/picolibc/1.4.7/0002-Add-picolibc-include-directory-to-cc1plus-spec.patch b/packages/picolibc/1.4.7/0002-Add-picolibc-include-directory-to-cc1plus-spec.patch new file mode 100644 index 0000000..267e1b2 --- /dev/null +++ b/packages/picolibc/1.4.7/0002-Add-picolibc-include-directory-to-cc1plus-spec.patch @@ -0,0 +1,26 @@ +From 1f6b3ddcbba7432a5b2f1061f24297989d6ce791 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Mon, 9 Nov 2020 13:02:44 -0800 +Subject: [PATCH] Add picolibc include directory to cc1plus spec + +G++ doesn't use the cpp spec to add include directories, so we need to +add the picolibc include directory to the cc1plus spec element as well +as the cpp one. To make sure the libstdc++ headers can use +GCC-provided header directories, so use -idirafter instead of -isystem. + +Signed-off-by: Keith Packard +--- + picolibc.specs.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/picolibc.specs.in ++++ b/picolibc.specs.in +@@ -10,7 +10,7 @@ + @TLSMODEL@ %(picolibc_cc1) @CC1_SPEC@ + + *cc1plus: +-@TLSMODEL@ %(picolibc_cc1plus) @CC1_SPEC@ @CC1PLUS_SPEC@ ++-idirafter @INCLUDEDIR@ @TLSMODEL@ %(picolibc_cc1plus) @CC1_SPEC@ @CC1PLUS_SPEC@ + + *link: + @SPECS_PRINTF@ -L@LIBDIR@/%M -L@LIBDIR@ %{!T:-Tpicolibc.ld} %(picolibc_link) --gc-sections @LINK_SPEC@ diff --git a/packages/picolibc/1.4.7/0003-Add-picolibc-include-directory-to-cc1plus-spec.patch b/packages/picolibc/1.4.7/0003-Add-picolibc-include-directory-to-cc1plus-spec.patch deleted file mode 100644 index 885c0c7..0000000 --- a/packages/picolibc/1.4.7/0003-Add-picolibc-include-directory-to-cc1plus-spec.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1f6b3ddcbba7432a5b2f1061f24297989d6ce791 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Mon, 9 Nov 2020 13:02:44 -0800 -Subject: [PATCH] Add picolibc include directory to cc1plus spec - -G++ doesn't use the cpp spec to add include directories, so we need to -add the picolibc include directory to the cc1plus spec element as well -as the cpp one. To make sure the libstdc++ headers can use -GCC-provided header directories, so use -idirafter instead of -isystem. - -Signed-off-by: Keith Packard ---- - picolibc.specs.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/picolibc.specs.in b/picolibc.specs.in -index c1f916a6f..133e65db9 100644 ---- a/picolibc.specs.in -+++ b/picolibc.specs.in -@@ -10,7 +10,7 @@ - @TLSMODEL@ %(picolibc_cc1) @CC1_SPEC@ - - *cc1plus: --@TLSMODEL@ %(picolibc_cc1plus) @CC1_SPEC@ @CC1PLUS_SPEC@ -+-idirafter @INCLUDEDIR@ @TLSMODEL@ %(picolibc_cc1plus) @CC1_SPEC@ @CC1PLUS_SPEC@ - - *link: - @SPECS_PRINTF@ -L@LIBDIR@/%M -L@LIBDIR@ %{!T:-Tpicolibc.ld} %(picolibc_link) --gc-sections @LINK_SPEC@ --- -2.28.0 - diff --git a/packages/picolibc/1.5.1/0000-libc-Remove-include-sys-select.h-from-sys-types.h.patch b/packages/picolibc/1.5.1/0000-libc-Remove-include-sys-select.h-from-sys-types.h.patch new file mode 100644 index 0000000..658d2e4 --- /dev/null +++ b/packages/picolibc/1.5.1/0000-libc-Remove-include-sys-select.h-from-sys-types.h.patch @@ -0,0 +1,25 @@ +From 9d0640874425e9f3f265c9baff7a47139b25ea7d Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Thu, 14 Jan 2021 17:54:22 -0800 +Subject: [PATCH 1/2] libc: Remove #include from sys/types.h + +picolibc's sys/select.h is likely to be replaced by the underlying +operating system version (as it is on Zephyr). Don't include it from +sys/types.h as that version may depend on other definitions in +sys/types.h which haven't yet been defined. + +Signed-off-by: Keith Packard +--- + newlib/libc/include/sys/types.h | 1 - + 1 file changed, 1 deletion(-) + +--- a/newlib/libc/include/sys/types.h ++++ b/newlib/libc/include/sys/types.h +@@ -75,7 +75,6 @@ + + #if __BSD_VISIBLE + #include +-#include + # define physadr physadr_t + # define quad quad_t + diff --git a/packages/picolibc/1.5.1/0001-libc-Remove-include-sys-select.h-from-sys-types.h.patch b/packages/picolibc/1.5.1/0001-libc-Remove-include-sys-select.h-from-sys-types.h.patch deleted file mode 100644 index 5536cd4..0000000 --- a/packages/picolibc/1.5.1/0001-libc-Remove-include-sys-select.h-from-sys-types.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9d0640874425e9f3f265c9baff7a47139b25ea7d Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Thu, 14 Jan 2021 17:54:22 -0800 -Subject: [PATCH 1/2] libc: Remove #include from sys/types.h - -picolibc's sys/select.h is likely to be replaced by the underlying -operating system version (as it is on Zephyr). Don't include it from -sys/types.h as that version may depend on other definitions in -sys/types.h which haven't yet been defined. - -Signed-off-by: Keith Packard ---- - newlib/libc/include/sys/types.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h -index ea25222c2..1a0abcb83 100644 ---- a/newlib/libc/include/sys/types.h -+++ b/newlib/libc/include/sys/types.h -@@ -75,7 +75,6 @@ typedef __intptr_t register_t; - - #if __BSD_VISIBLE - #include --#include - # define physadr physadr_t - # define quad quad_t - --- -2.30.0 - diff --git a/packages/picolibc/1.5.1/0001-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch b/packages/picolibc/1.5.1/0001-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch new file mode 100644 index 0000000..911788a --- /dev/null +++ b/packages/picolibc/1.5.1/0001-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch @@ -0,0 +1,70 @@ +From 9df2d784439720abbf67fa96c6515a5c4a9f230a Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Thu, 14 Jan 2021 18:48:44 -0800 +Subject: [PATCH 2/2] tinystdio: Fix snprintf(buf, 0, ...) to not smash buffer + +snprintf(buf, 0) should not write anything to the destination, not +even a trailing '\0'. The tinystdio implementation had a signed +comparison bug where this case would cause a null to be placed in the +output buffer at the size of the data that would have been written. + +Add a test to make sure snprintf respects the 'len' parameter +correctly. + +Signed-off-by: Keith Packard +--- + newlib/libc/tinystdio/snprintf.c | 2 +- + test/printf_scanf.c | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 32 insertions(+), 1 deletion(-) + +--- a/newlib/libc/tinystdio/snprintf.c ++++ b/newlib/libc/tinystdio/snprintf.c +@@ -56,7 +56,7 @@ + i = vfprintf(&f.file, fmt, ap); + va_end(ap); + +- if (n >= 0 && i >= 0) ++ if ((int) n >= 0 && i >= 0) + s[i < n ? i : n] = 0; + + return i; +--- a/test/printf_scanf.c ++++ b/test/printf_scanf.c +@@ -96,6 +96,37 @@ + fflush(stdout); + } + #endif ++ ++ /* ++ * test snprintf to make sure it doesn't overwrite the specified buffer ++ * length (even if that is zero) ++ */ ++ for (x = 0; x <= 6; x++) { ++ char tbuf[10] = "xxxxxxxxx"; ++ const char ref[10] = "xxxxxxxxx"; ++ int i = snprintf(tbuf, x, "%s", "123"); ++ int y = x <= 4 ? x : 4; ++ if (i != 3) { ++ printf("snprintf(tbuf, %d, \"%%s\", \"123\") return %d instead of %d\n", ++ x, i, 3); ++ errors++; ++ } ++ int l = strlen(tbuf); ++ if (y > 0 && l != y - 1) { ++ printf("returned buffer len want %d got %d\n", y - 1, l); ++ errors++; ++ } ++ if (y > 0 && strncmp(tbuf, "123", y - 1) != 0) { ++ strncpy(buf, "123", y - 1); ++ buf[y-1] = '\0'; ++ printf("returned buffer want %s got %s\n", buf, tbuf); ++ errors++; ++ } ++ if (memcmp(tbuf + y, ref + y, sizeof(tbuf) - y) != 0) { ++ printf("tail of buf mangled %s\n", tbuf + y); ++ errors++; ++ } ++ } + for (x = 0; x < 32; x++) { + unsigned int v = 0x12345678 >> x; + unsigned int r; diff --git a/packages/picolibc/1.5.1/0002-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch b/packages/picolibc/1.5.1/0002-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch new file mode 100644 index 0000000..a3e0544 --- /dev/null +++ b/packages/picolibc/1.5.1/0002-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch @@ -0,0 +1,103 @@ +From f0c62653bbcf68291a7dd621db367a9fef666183 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Sun, 24 Jan 2021 15:27:14 -0800 +Subject: [PATCH 3/3] libc: Expose wchar stdio prototypes even for TINY_STDIO + +This makes libstdc++ happy when wrapping these names, even though they +aren't actually available for appplications. + +Signed-off-by: Keith Packard +--- + newlib/libc/include/wchar.h | 39 ++++++++++++++++++++------------------- + 1 file changed, 20 insertions(+), 19 deletions(-) + +--- a/newlib/libc/include/wchar.h ++++ b/newlib/libc/include/wchar.h +@@ -217,8 +217,6 @@ + long double wcstold_l (const wchar_t *, wchar_t **, locale_t); + #endif + +-#ifndef TINY_STDIO +- + wint_t fgetwc (__FILE *); + wchar_t *fgetws (wchar_t *__restrict, int, __FILE *__restrict); + wint_t fputwc (wchar_t, __FILE *); +@@ -232,6 +230,8 @@ + wint_t putwchar (wchar_t); + wint_t ungetwc (wint_t wc, __FILE *); + ++#ifndef TINY_STDIO ++ + struct _reent; + + wint_t _fgetwc_r (struct _reent *, __FILE *); +@@ -253,6 +253,24 @@ + wint_t _putwchar_unlocked_r (struct _reent *, wchar_t); + wint_t _ungetwc_r (struct _reent *, wint_t wc, __FILE *); + ++int _fwprintf_r (struct _reent *, __FILE *, const wchar_t *, ...); ++int _swprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, ...); ++int _vfwprintf_r (struct _reent *, __FILE *, const wchar_t *, va_list); ++int _vswprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, va_list); ++int _vwprintf_r (struct _reent *, const wchar_t *, va_list); ++int _wprintf_r (struct _reent *, const wchar_t *, ...); ++ ++int _fwscanf_r (struct _reent *, __FILE *, const wchar_t *, ...); ++int _swscanf_r (struct _reent *, const wchar_t *, const wchar_t *, ...); ++int _vfwscanf_r (struct _reent *, __FILE *, const wchar_t *, va_list); ++int _vswscanf_r (struct _reent *, const wchar_t *, const wchar_t *, va_list); ++int _vwscanf_r (struct _reent *, const wchar_t *, va_list); ++int _wscanf_r (struct _reent *, const wchar_t *, ...); ++ ++__FILE *_open_wmemstream_r (struct _reent *, wchar_t **, size_t *); ++ ++#endif ++ + #if __GNU_VISIBLE + wint_t fgetwc_unlocked (__FILE *); + wchar_t *fgetws_unlocked (wchar_t *__restrict, int, __FILE *__restrict); +@@ -267,7 +285,6 @@ + #if __POSIX_VISIBLE >= 200809 + __FILE *open_wmemstream (wchar_t **, size_t *); + #endif +-__FILE *_open_wmemstream_r (struct _reent *, wchar_t **, size_t *); + + #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500 + int fwprintf (__FILE *__restrict, const wchar_t *__restrict, ...); +@@ -281,13 +298,6 @@ + int wprintf (const wchar_t *__restrict, ...); + #endif + +-int _fwprintf_r (struct _reent *, __FILE *, const wchar_t *, ...); +-int _swprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, ...); +-int _vfwprintf_r (struct _reent *, __FILE *, const wchar_t *, va_list); +-int _vswprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, va_list); +-int _vwprintf_r (struct _reent *, const wchar_t *, va_list); +-int _wprintf_r (struct _reent *, const wchar_t *, ...); +- + #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500 + int fwscanf (__FILE *__restrict, const wchar_t *__restrict, ...); + int swscanf (const wchar_t *__restrict, +@@ -300,13 +310,6 @@ + int wscanf (const wchar_t *__restrict, ...); + #endif + +-int _fwscanf_r (struct _reent *, __FILE *, const wchar_t *, ...); +-int _swscanf_r (struct _reent *, const wchar_t *, const wchar_t *, ...); +-int _vfwscanf_r (struct _reent *, __FILE *, const wchar_t *, va_list); +-int _vswscanf_r (struct _reent *, const wchar_t *, const wchar_t *, va_list); +-int _vwscanf_r (struct _reent *, const wchar_t *, va_list); +-int _wscanf_r (struct _reent *, const wchar_t *, ...); +- + #define getwc(fp) fgetwc(fp) + #define putwc(wc,fp) fputwc((wc), (fp)) + #define getwchar() fgetwc(stdin) +@@ -319,8 +322,6 @@ + #define putwchar_unlocked(wc) fputwc_unlocked((wc), stdout) + #endif + +-#endif /* !TINY_STDIO */ +- + _END_STD_C + + #if __SSP_FORTIFY_LEVEL > 0 diff --git a/packages/picolibc/1.5.1/0002-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch b/packages/picolibc/1.5.1/0002-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch deleted file mode 100644 index 754957e..0000000 --- a/packages/picolibc/1.5.1/0002-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 9df2d784439720abbf67fa96c6515a5c4a9f230a Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Thu, 14 Jan 2021 18:48:44 -0800 -Subject: [PATCH 2/2] tinystdio: Fix snprintf(buf, 0, ...) to not smash buffer - -snprintf(buf, 0) should not write anything to the destination, not -even a trailing '\0'. The tinystdio implementation had a signed -comparison bug where this case would cause a null to be placed in the -output buffer at the size of the data that would have been written. - -Add a test to make sure snprintf respects the 'len' parameter -correctly. - -Signed-off-by: Keith Packard ---- - newlib/libc/tinystdio/snprintf.c | 2 +- - test/printf_scanf.c | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 32 insertions(+), 1 deletion(-) - -diff --git a/newlib/libc/tinystdio/snprintf.c b/newlib/libc/tinystdio/snprintf.c -index 52d2f84d3..1052c9338 100644 ---- a/newlib/libc/tinystdio/snprintf.c -+++ b/newlib/libc/tinystdio/snprintf.c -@@ -56,7 +56,7 @@ snprintf(char *s, size_t n, const char *fmt, ...) - i = vfprintf(&f.file, fmt, ap); - va_end(ap); - -- if (n >= 0 && i >= 0) -+ if ((int) n >= 0 && i >= 0) - s[i < n ? i : n] = 0; - - return i; -diff --git a/test/printf_scanf.c b/test/printf_scanf.c -index 2bc83e1d0..f89f46e4f 100644 ---- a/test/printf_scanf.c -+++ b/test/printf_scanf.c -@@ -96,6 +96,37 @@ main(int argc, char **argv) - fflush(stdout); - } - #endif -+ -+ /* -+ * test snprintf to make sure it doesn't overwrite the specified buffer -+ * length (even if that is zero) -+ */ -+ for (x = 0; x <= 6; x++) { -+ char tbuf[10] = "xxxxxxxxx"; -+ const char ref[10] = "xxxxxxxxx"; -+ int i = snprintf(tbuf, x, "%s", "123"); -+ int y = x <= 4 ? x : 4; -+ if (i != 3) { -+ printf("snprintf(tbuf, %d, \"%%s\", \"123\") return %d instead of %d\n", -+ x, i, 3); -+ errors++; -+ } -+ int l = strlen(tbuf); -+ if (y > 0 && l != y - 1) { -+ printf("returned buffer len want %d got %d\n", y - 1, l); -+ errors++; -+ } -+ if (y > 0 && strncmp(tbuf, "123", y - 1) != 0) { -+ strncpy(buf, "123", y - 1); -+ buf[y-1] = '\0'; -+ printf("returned buffer want %s got %s\n", buf, tbuf); -+ errors++; -+ } -+ if (memcmp(tbuf + y, ref + y, sizeof(tbuf) - y) != 0) { -+ printf("tail of buf mangled %s\n", tbuf + y); -+ errors++; -+ } -+ } - for (x = 0; x < 32; x++) { - unsigned int v = 0x12345678 >> x; - unsigned int r; --- -2.30.0 - diff --git a/packages/picolibc/1.5.1/0003-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch b/packages/picolibc/1.5.1/0003-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch deleted file mode 100644 index 5e1c5a8..0000000 --- a/packages/picolibc/1.5.1/0003-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch +++ /dev/null @@ -1,108 +0,0 @@ -From f0c62653bbcf68291a7dd621db367a9fef666183 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Sun, 24 Jan 2021 15:27:14 -0800 -Subject: [PATCH 3/3] libc: Expose wchar stdio prototypes even for TINY_STDIO - -This makes libstdc++ happy when wrapping these names, even though they -aren't actually available for appplications. - -Signed-off-by: Keith Packard ---- - newlib/libc/include/wchar.h | 39 +++++++++++++++++++------------------ - 1 file changed, 20 insertions(+), 19 deletions(-) - -diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h -index 8a9c4b0fe..5dc3af93c 100644 ---- a/newlib/libc/include/wchar.h -+++ b/newlib/libc/include/wchar.h -@@ -217,8 +217,6 @@ float wcstof_l (const wchar_t *, wchar_t **, locale_t); - long double wcstold_l (const wchar_t *, wchar_t **, locale_t); - #endif - --#ifndef TINY_STDIO -- - wint_t fgetwc (__FILE *); - wchar_t *fgetws (wchar_t *__restrict, int, __FILE *__restrict); - wint_t fputwc (wchar_t, __FILE *); -@@ -232,6 +230,8 @@ wint_t putwc (wchar_t, __FILE *); - wint_t putwchar (wchar_t); - wint_t ungetwc (wint_t wc, __FILE *); - -+#ifndef TINY_STDIO -+ - struct _reent; - - wint_t _fgetwc_r (struct _reent *, __FILE *); -@@ -253,6 +253,24 @@ wint_t _putwchar_r (struct _reent *, wchar_t); - wint_t _putwchar_unlocked_r (struct _reent *, wchar_t); - wint_t _ungetwc_r (struct _reent *, wint_t wc, __FILE *); - -+int _fwprintf_r (struct _reent *, __FILE *, const wchar_t *, ...); -+int _swprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, ...); -+int _vfwprintf_r (struct _reent *, __FILE *, const wchar_t *, va_list); -+int _vswprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, va_list); -+int _vwprintf_r (struct _reent *, const wchar_t *, va_list); -+int _wprintf_r (struct _reent *, const wchar_t *, ...); -+ -+int _fwscanf_r (struct _reent *, __FILE *, const wchar_t *, ...); -+int _swscanf_r (struct _reent *, const wchar_t *, const wchar_t *, ...); -+int _vfwscanf_r (struct _reent *, __FILE *, const wchar_t *, va_list); -+int _vswscanf_r (struct _reent *, const wchar_t *, const wchar_t *, va_list); -+int _vwscanf_r (struct _reent *, const wchar_t *, va_list); -+int _wscanf_r (struct _reent *, const wchar_t *, ...); -+ -+__FILE *_open_wmemstream_r (struct _reent *, wchar_t **, size_t *); -+ -+#endif -+ - #if __GNU_VISIBLE - wint_t fgetwc_unlocked (__FILE *); - wchar_t *fgetws_unlocked (wchar_t *__restrict, int, __FILE *__restrict); -@@ -267,7 +285,6 @@ wint_t putwchar_unlocked (wchar_t); - #if __POSIX_VISIBLE >= 200809 - __FILE *open_wmemstream (wchar_t **, size_t *); - #endif --__FILE *_open_wmemstream_r (struct _reent *, wchar_t **, size_t *); - - #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500 - int fwprintf (__FILE *__restrict, const wchar_t *__restrict, ...); -@@ -281,13 +298,6 @@ int vwprintf (const wchar_t *__restrict, va_list); - int wprintf (const wchar_t *__restrict, ...); - #endif - --int _fwprintf_r (struct _reent *, __FILE *, const wchar_t *, ...); --int _swprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, ...); --int _vfwprintf_r (struct _reent *, __FILE *, const wchar_t *, va_list); --int _vswprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, va_list); --int _vwprintf_r (struct _reent *, const wchar_t *, va_list); --int _wprintf_r (struct _reent *, const wchar_t *, ...); -- - #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500 - int fwscanf (__FILE *__restrict, const wchar_t *__restrict, ...); - int swscanf (const wchar_t *__restrict, -@@ -300,13 +310,6 @@ int vwscanf (const wchar_t *__restrict, va_list); - int wscanf (const wchar_t *__restrict, ...); - #endif - --int _fwscanf_r (struct _reent *, __FILE *, const wchar_t *, ...); --int _swscanf_r (struct _reent *, const wchar_t *, const wchar_t *, ...); --int _vfwscanf_r (struct _reent *, __FILE *, const wchar_t *, va_list); --int _vswscanf_r (struct _reent *, const wchar_t *, const wchar_t *, va_list); --int _vwscanf_r (struct _reent *, const wchar_t *, va_list); --int _wscanf_r (struct _reent *, const wchar_t *, ...); -- - #define getwc(fp) fgetwc(fp) - #define putwc(wc,fp) fputwc((wc), (fp)) - #define getwchar() fgetwc(stdin) -@@ -319,8 +322,6 @@ int _wscanf_r (struct _reent *, const wchar_t *, ...); - #define putwchar_unlocked(wc) fputwc_unlocked((wc), stdout) - #endif - --#endif /* !TINY_STDIO */ -- - _END_STD_C - - #if __SSP_FORTIFY_LEVEL > 0 --- -2.30.0 - diff --git a/packages/strace/4.26/0000-mips-o32-fix-build.patch b/packages/strace/4.26/0000-mips-o32-fix-build.patch index d3c828e..afb1f40 100644 --- a/packages/strace/4.26/0000-mips-o32-fix-build.patch +++ b/packages/strace/4.26/0000-mips-o32-fix-build.patch @@ -17,11 +17,14 @@ Date: Tue Jan 8 19:23:44 2019 +0000 Reported-by: Baruch Siach Fixes: v4.26~61 "Refactor stack pointers" -diff --git a/linux/mips/get_syscall_args.c b/linux/mips/get_syscall_args.c -index 387aa852..e2889f98 100644 +--- + linux/mips/get_syscall_args.c | 26 ++++++++++++++++++++++++++ + syscall.c | 27 ++------------------------- + 2 files changed, 28 insertions(+), 25 deletions(-) + --- a/linux/mips/get_syscall_args.c +++ b/linux/mips/get_syscall_args.c -@@ -37,3 +37,29 @@ arch_get_syscall_args(struct tcb *tcp) +@@ -37,3 +37,29 @@ #endif return 1; } @@ -51,11 +54,9 @@ index 387aa852..e2889f98 100644 + } +} +#endif /* SYS_syscall_subcall */ -diff --git a/syscall.c b/syscall.c -index d78f51dd..51fcc721 100644 --- a/syscall.c +++ b/syscall.c -@@ -349,31 +349,8 @@ decode_ipc_subcall(struct tcb *tcp) +@@ -349,31 +349,8 @@ #endif /* SYS_ipc_subcall */ #ifdef SYS_syscall_subcall diff --git a/packages/strace/5.14/0000-Avoid-relying-on-presence-of-ipx.h.patch b/packages/strace/5.14/0000-Avoid-relying-on-presence-of-ipx.h.patch new file mode 100644 index 0000000..69421a5 --- /dev/null +++ b/packages/strace/5.14/0000-Avoid-relying-on-presence-of-ipx.h.patch @@ -0,0 +1,135 @@ +From d8eb6a06192d982977b3ff12b6d1ca69beaa7bb3 Mon Sep 17 00:00:00 2001 +From: Eugene Syromyatnikov +Date: Wed, 3 Nov 2021 00:48:59 +0100 +Subject: [PATCH] Avoid relying on presence of ipx.h + +After Linux has broken UAPI in commit v5.15-rc1~157^2~207, it is well +possible that neither kernel nor libc (such as musl, for example) +provides an IPX-related header. Avoid relying on its presence +in the strace's code and conditionalise the relevant checks in the tests. + +* configure.ac (AC_CHECK_HEADERS): Add linux/ipx.h. +* src/net.c: Remove / includes. +* src/sockaddr.c: Likewise. +(IPX_NODE_LEN): New macro constant. +(struct sockaddr_ipx): New type definition. +* src/xlat/sock_ipx_options.in (IPX_TYPE): Provide a fallback value. +* tests/net-sockaddr.c [!HAVE_LINUX_IPX_H]: Do not include +. +[!HAVE_LINUX_IPX_H && HAVE_NETIPX_IPX_H]: Include . +[!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)] (check_ipx): Do not +define. +(main) [!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)]: Do not call +check_ipx. + +Closes: https://github.com/strace/strace/issues/201 +--- + configure.ac | 1 + + src/net.c | 5 ----- + src/sockaddr.c | 16 ++++++++++------ + src/xlat/sock_ipx_options.in | 2 +- + tests/net-sockaddr.c | 10 +++++++++- + 5 files changed, 21 insertions(+), 13 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -423,6 +423,7 @@ + elf.h + gcov.h + iconv.h ++ linux/ipx.h + mqueue.h + netinet/sctp.h + netipx/ipx.h +--- a/src/net.c ++++ b/src/net.c +@@ -28,11 +28,6 @@ + #include + #include + #include +-#ifdef HAVE_NETIPX_IPX_H +-# include +-#else +-# include +-#endif + + #include + #include "netlink.h" +--- a/src/sockaddr.c ++++ b/src/sockaddr.c +@@ -24,12 +24,6 @@ + #include + #include + +-#ifdef HAVE_NETIPX_IPX_H +-# include +-#else +-# include +-#endif +- + #include "xlat/addrfams.h" + #include "xlat/arp_hardware_types.h" + #include "xlat/ethernet_protocols.h" +@@ -42,6 +36,16 @@ + + #define SIZEOF_SA_FAMILY sizeof_field(struct sockaddr, sa_family) + ++#define IPX_NODE_LEN 6 ++struct sockaddr_ipx { ++ uint16_t sipx_family; ++ uint16_t sipx_port; ++ uint32_t sipx_network; ++ unsigned char sipx_node[IPX_NODE_LEN]; ++ uint8_t sipx_type; ++ unsigned char sipx_zero; ++}; ++ + const size_t arp_hardware_types_size = ARRAY_SIZE(arp_hardware_types) - 1; + const size_t ethernet_protocols_size = ARRAY_SIZE(ethernet_protocols) - 1; + +--- a/src/xlat/sock_ipx_options.in ++++ b/src/xlat/sock_ipx_options.in +@@ -1 +1 @@ +-IPX_TYPE ++IPX_TYPE 1 +--- a/tests/net-sockaddr.c ++++ b/tests/net-sockaddr.c +@@ -24,7 +24,11 @@ + #include + #include + #include +-#include ++#if defined HAVE_LINUX_IPX_H ++# include ++#elif defined HAVE_NETIPX_IPX_H ++# include ++#endif + #ifdef HAVE_BLUETOOTH_BLUETOOTH_H + # include + # include +@@ -269,6 +273,7 @@ + printf("connect(-1, %p, %u) = %d EBADF (%m)\n", in6, len, ret); + } + ++#if defined HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H + static void + check_ipx(void) + { +@@ -295,6 +300,7 @@ + c_ipx.sipx_node[4], c_ipx.sipx_node[5], + c_ipx.sipx_type, len, ret); + } ++#endif /* HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H */ + + /* for a bit more compact AX.25 address definitions */ + #define AX25_ADDR(c_, s_) \ +@@ -773,7 +779,9 @@ + check_un(); + check_in(); + check_in6(); ++#if defined HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H + check_ipx(); ++#endif + check_ax25(); + check_x25(); + check_nl(); diff --git a/packages/strace/5.14/0001-Avoid-relying-on-presence-of-ipx.h.patch b/packages/strace/5.14/0001-Avoid-relying-on-presence-of-ipx.h.patch deleted file mode 100644 index 93955eb..0000000 --- a/packages/strace/5.14/0001-Avoid-relying-on-presence-of-ipx.h.patch +++ /dev/null @@ -1,148 +0,0 @@ -From d8eb6a06192d982977b3ff12b6d1ca69beaa7bb3 Mon Sep 17 00:00:00 2001 -From: Eugene Syromyatnikov -Date: Wed, 3 Nov 2021 00:48:59 +0100 -Subject: [PATCH] Avoid relying on presence of ipx.h - -After Linux has broken UAPI in commit v5.15-rc1~157^2~207, it is well -possible that neither kernel nor libc (such as musl, for example) -provides an IPX-related header. Avoid relying on its presence -in the strace's code and conditionalise the relevant checks in the tests. - -* configure.ac (AC_CHECK_HEADERS): Add linux/ipx.h. -* src/net.c: Remove / includes. -* src/sockaddr.c: Likewise. -(IPX_NODE_LEN): New macro constant. -(struct sockaddr_ipx): New type definition. -* src/xlat/sock_ipx_options.in (IPX_TYPE): Provide a fallback value. -* tests/net-sockaddr.c [!HAVE_LINUX_IPX_H]: Do not include -. -[!HAVE_LINUX_IPX_H && HAVE_NETIPX_IPX_H]: Include . -[!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)] (check_ipx): Do not -define. -(main) [!(HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H)]: Do not call -check_ipx. - -Closes: https://github.com/strace/strace/issues/201 ---- - configure.ac | 1 + - src/net.c | 5 ----- - src/sockaddr.c | 16 ++++++++++------ - src/xlat/sock_ipx_options.in | 2 +- - tests/net-sockaddr.c | 10 +++++++++- - 5 files changed, 21 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2771c0f82..3c7fcb91e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -423,6 +423,7 @@ AC_CHECK_HEADERS(m4_normalize([ - elf.h - gcov.h - iconv.h -+ linux/ipx.h - mqueue.h - netinet/sctp.h - netipx/ipx.h -diff --git a/src/net.c b/src/net.c -index b23911a97..bbc52e15f 100644 ---- a/src/net.c -+++ b/src/net.c -@@ -28,11 +28,6 @@ - #include - #include - #include --#ifdef HAVE_NETIPX_IPX_H --# include --#else --# include --#endif - - #include - #include "netlink.h" -diff --git a/src/sockaddr.c b/src/sockaddr.c -index 8b2b0afaf..66aa04d59 100644 ---- a/src/sockaddr.c -+++ b/src/sockaddr.c -@@ -24,12 +24,6 @@ - #include - #include - --#ifdef HAVE_NETIPX_IPX_H --# include --#else --# include --#endif -- - #include "xlat/addrfams.h" - #include "xlat/arp_hardware_types.h" - #include "xlat/ethernet_protocols.h" -@@ -42,6 +36,16 @@ - - #define SIZEOF_SA_FAMILY sizeof_field(struct sockaddr, sa_family) - -+#define IPX_NODE_LEN 6 -+struct sockaddr_ipx { -+ uint16_t sipx_family; -+ uint16_t sipx_port; -+ uint32_t sipx_network; -+ unsigned char sipx_node[IPX_NODE_LEN]; -+ uint8_t sipx_type; -+ unsigned char sipx_zero; -+}; -+ - const size_t arp_hardware_types_size = ARRAY_SIZE(arp_hardware_types) - 1; - const size_t ethernet_protocols_size = ARRAY_SIZE(ethernet_protocols) - 1; - -diff --git a/src/xlat/sock_ipx_options.in b/src/xlat/sock_ipx_options.in -index eba97fd71..b09be117e 100644 ---- a/src/xlat/sock_ipx_options.in -+++ b/src/xlat/sock_ipx_options.in -@@ -1 +1 @@ --IPX_TYPE -+IPX_TYPE 1 -diff --git a/tests/net-sockaddr.c b/tests/net-sockaddr.c -index f1f9b01cd..c8049fd68 100644 ---- a/tests/net-sockaddr.c -+++ b/tests/net-sockaddr.c -@@ -24,7 +24,11 @@ - #include - #include - #include --#include -+#if defined HAVE_LINUX_IPX_H -+# include -+#elif defined HAVE_NETIPX_IPX_H -+# include -+#endif - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - # include - # include -@@ -269,6 +273,7 @@ check_in6(void) - printf("connect(-1, %p, %u) = %d EBADF (%m)\n", in6, len, ret); - } - -+#if defined HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H - static void - check_ipx(void) - { -@@ -295,6 +300,7 @@ check_ipx(void) - c_ipx.sipx_node[4], c_ipx.sipx_node[5], - c_ipx.sipx_type, len, ret); - } -+#endif /* HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H */ - - /* for a bit more compact AX.25 address definitions */ - #define AX25_ADDR(c_, s_) \ -@@ -773,7 +779,9 @@ main(void) - check_un(); - check_in(); - check_in6(); -+#if defined HAVE_LINUX_IPX_H || defined HAVE_NETIPX_IPX_H - check_ipx(); -+#endif - check_ax25(); - check_x25(); - check_nl(); --- -2.33.1 - diff --git a/packages/uClibc-ng/1.0.38/0000-include-sys-personality-h-resync-with-glibc.patch b/packages/uClibc-ng/1.0.38/0000-include-sys-personality-h-resync-with-glibc.patch index 446cd6e..6c1d9ba 100644 --- a/packages/uClibc-ng/1.0.38/0000-include-sys-personality-h-resync-with-glibc.patch +++ b/packages/uClibc-ng/1.0.38/0000-include-sys-personality-h-resync-with-glibc.patch @@ -8,11 +8,9 @@ defined in uClibc-ng, but is used for example by the uftrace project. Signed-off-by: Thomas Petazzoni --- - include/sys/personality.h | 18 +++++++++++++----- + include/sys/personality.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) -diff --git a/include/sys/personality.h b/include/sys/personality.h -index ee1de64..fd77bdb 100644 --- a/include/sys/personality.h +++ b/include/sys/personality.h @@ -1,4 +1,4 @@ @@ -51,7 +49,7 @@ index ee1de64..fd77bdb 100644 }; /* Personality types. -@@ -41,6 +47,7 @@ enum +@@ -41,6 +47,7 @@ { PER_LINUX = 0x0000, PER_LINUX_32BIT = 0x0000 | ADDR_LIMIT_32BIT, @@ -59,7 +57,7 @@ index ee1de64..fd77bdb 100644 PER_SVR4 = 0x0001 | STICKY_TIMEOUTS | MMAP_PAGE_ZERO, PER_SVR3 = 0x0002 | STICKY_TIMEOUTS | SHORT_INODE, PER_SCOSVR3 = 0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS | SHORT_INODE, -@@ -51,14 +58,15 @@ enum +@@ -51,14 +58,15 @@ PER_SUNOS = 0x0006 | STICKY_TIMEOUTS, PER_XENIX = 0x0007 | STICKY_TIMEOUTS | SHORT_INODE, PER_LINUX32 = 0x0008, @@ -77,6 +75,3 @@ index ee1de64..fd77bdb 100644 PER_MASK = 0x00ff, }; --- -cgit v0.11.2-3-g2eb4 - diff --git a/packages/zlib/1.2.11/0003-crossbuild-macos-libtool.patch b/packages/zlib/1.2.11/0003-crossbuild-macos-libtool.patch index e04f65d..3220a54 100644 --- a/packages/zlib/1.2.11/0003-crossbuild-macos-libtool.patch +++ b/packages/zlib/1.2.11/0003-crossbuild-macos-libtool.patch @@ -4,11 +4,13 @@ Date: Fri May 22 03:32:33 2020 +0200 configure: use LIBTOOL variable for Darwin builds -diff --git a/configure b/configure -index e974d1f..0c88bf9 100755 +--- + configure | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + --- a/configure +++ b/configure -@@ -66,6 +66,12 @@ if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then +@@ -66,6 +66,12 @@ else NM=${NM-"nm"} fi @@ -21,7 +23,7 @@ index e974d1f..0c88bf9 100755 # set defaults before processing command line options LDCONFIG=${LDCONFIG-"ldconfig"} -@@ -241,8 +247,8 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then +@@ -241,8 +247,8 @@ SHAREDLIBV=libz.$VER$shared_ext SHAREDLIBM=libz.$VER1$shared_ext LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} -- cgit v0.10.2-6-g49f6