diff -ruN gcc-4.4.5-6.el6.src.rpm-rpmbuild/SOURCES/gcc44-deb621083-arm-triplet-backport.patch gcc-4.4.5-6.el6.0.src.rpm-rpmbuild/SOURCES/gcc44-deb621083-arm-triplet-backport.patch --- gcc-4.4.5-6.el6.src.rpm-rpmbuild/SOURCES/gcc44-deb621083-arm-triplet-backport.patch 1970-01-01 01:00:00.000000000 +0100 +++ gcc-4.4.5-6.el6.0.src.rpm-rpmbuild/SOURCES/gcc44-deb621083-arm-triplet-backport.patch 2011-08-12 20:42:19.000000000 +0100 @@ -0,0 +1,108 @@ +# DP: add support for arm-linux-*eabi* triplets; useful for armhf + +Index: gcc-4.5-4.5.2/src/configure.ac +=================================================================== +--- gcc-4.5-4.5.2.orig/src/configure.ac 2011-03-18 19:10:48.804622758 +0000 ++++ gcc-4.5-4.5.2/src/configure.ac 2011-03-18 19:11:18.324622793 +0000 +@@ -592,7 +592,7 @@ + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-*eabi*) + noconfigdirs="$noconfigdirs target-qthreads" + case ${with_newlib} in + no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" +Index: gcc-4.5-4.5.2/src/gcc/ada/gcc-interface/Makefile.in +=================================================================== +--- gcc-4.5-4.5.2.orig/src/gcc/config.gcc 2011-03-18 19:12:05.128622749 +0000 ++++ gcc-4.5-4.5.2/src/gcc/config.gcc 2011-03-18 19:12:52.960622752 +0000 +@@ -736,7 +736,7 @@ + esac + tmake_file="${tmake_file} t-linux arm/t-arm" + case ${target} in +- arm*-*-linux-*eabi) ++ arm*-*-linux-*eabi*) + tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h" + tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc" + # The BPABI long long divmod functions return a 128-bit value in +@@ -757,7 +757,7 @@ + tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h" + tmake_file="arm/t-arm arm/t-arm-elf" + case ${target} in +- arm*-*-uclinux*eabi) ++ arm*-*-uclinux*eabi*) + tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h" + tmake_file="$tmake_file arm/t-bpabi" + # The BPABI long long divmod functions return a 128-bit value in +Index: gcc-4.5-4.5.2/src/gcc/testsuite/lib/target-supports.exp +=================================================================== +--- gcc-4.5-4.5.2.orig/src/gcc/testsuite/lib/target-supports.exp 2011-03-18 19:13:48.604622749 +0000 ++++ gcc-4.5-4.5.2/src/gcc/testsuite/lib/target-supports.exp 2011-03-18 19:14:24.132622629 +0000 +@@ -2593,7 +2593,7 @@ + || [istarget i?86-*-*] + || [istarget x86_64-*-*] + || [istarget alpha*-*-*] +- || [istarget arm*-*-linux-gnueabi] ++ || [istarget arm*-*-linux-*eabi*] + || [istarget s390*-*-*] + || [istarget powerpc*-*-*] + || [istarget sparc64-*-*] +@@ -2622,7 +2622,7 @@ + || [istarget i?86-*-*] + || [istarget x86_64-*-*] + || [istarget alpha*-*-*] +- || [istarget arm*-*-linux-gnueabi] ++ || [istarget arm*-*-linux-*eabi*] + || [istarget s390*-*-*] + || [istarget powerpc*-*-*] + || [istarget sparc64-*-*] +Index: gcc-4.5-4.5.2/src/libjava/configure.ac +=================================================================== +--- gcc-4.5-4.5.2.orig/src/libjava/configure.ac 2011-03-18 19:14:37.464622750 +0000 ++++ gcc-4.5-4.5.2/src/libjava/configure.ac 2011-03-18 19:15:00.780622755 +0000 +@@ -920,7 +920,7 @@ + # on Darwin -single_module speeds up loading of the dynamic libraries. + extra_ldflags_libjava=-Wl,-single_module + ;; +-arm*linux*eabi) ++arm*-*-linux-*eabi*) + # Some of the ARM unwinder code is actually in libstdc++. We + # could in principle replicate it in libgcj, but it's better to + # have a dependency on libstdc++. +Index: gcc-4.5-4.5.2/src/libstdc++-v3/configure.host +=================================================================== +--- gcc-4.5-4.5.2.orig/src/libstdc++-v3/configure.host 2011-03-18 19:15:16.288622758 +0000 ++++ gcc-4.5-4.5.2/src/libstdc++-v3/configure.host 2011-03-18 19:15:30.932622217 +0000 +@@ -325,7 +325,7 @@ + fi + esac + case "${host}" in +- arm*-*-linux-*eabi) ++ arm*-*-linux-*eabi*) + port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver" + ;; + esac +Index: gcc-4.5-4.5.2/src/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc +=================================================================== +--- gcc-4.5-4.5.2.orig/src/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc 2011-03-18 19:15:43.204622783 +0000 ++++ gcc-4.5-4.5.2/src/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc 2011-03-18 19:16:06.324622740 +0000 +@@ -1,5 +1,5 @@ + // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" } +-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } ++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } } + + // 2007-05-03 Benjamin Kosnik + // +Index: gcc-4.5-4.5.2/src/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc +=================================================================== +--- gcc-4.5-4.5.2.orig/src/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc 2011-03-18 19:16:31.144622761 +0000 ++++ gcc-4.5-4.5.2/src/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc 2011-03-18 19:16:41.420622950 +0000 +@@ -1,5 +1,5 @@ + // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" } +-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } ++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } } + + // 2007-05-03 Benjamin Kosnik + // + diff -ruN gcc-4.4.5-6.el6.src.rpm-rpmbuild/SOURCES/libgcc_post_upgrade.c gcc-4.4.5-6.el6.0.src.rpm-rpmbuild/SOURCES/libgcc_post_upgrade.c --- gcc-4.4.5-6.el6.src.rpm-rpmbuild/SOURCES/libgcc_post_upgrade.c 2009-05-20 01:00:20.000000000 +0100 +++ gcc-4.4.5-6.el6.0.src.rpm-rpmbuild/SOURCES/libgcc_post_upgrade.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,483 +0,0 @@ -#ifdef __sparc__ -register void *__thread_self __asm ("g7"); -#endif -#include -#include -#include - -#if defined __i386__ -# define INTERNAL_SYSCALL_DECL(err) do { } while (0) -# define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ - register unsigned int resultvar; \ - asm volatile ( \ - "movl %1, %%eax\n\t" \ - "int $0x80\n\t" \ - : "=a" (resultvar) \ - : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ - (int) resultvar; }) -# define INTERNAL_SYSCALL_ERROR_P(val, err) \ - ((unsigned int) (val) >= 0xfffff001u) -# define ASMFMT_0() -# define ASMFMT_1(arg1) \ - , "b" (arg1) -# define ASMFMT_2(arg1, arg2) \ - , "b" (arg1), "c" (arg2) -# define ASMFMT_3(arg1, arg2, arg3) \ - , "b" (arg1), "c" (arg2), "d" (arg3) -#elif defined __x86_64__ -# define INTERNAL_SYSCALL_DECL(err) do { } while (0) -# define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ - ({ \ - unsigned long resultvar; \ - LOAD_ARGS_##nr (args) \ - LOAD_REGS_##nr \ - asm volatile ( \ - "syscall\n\t" \ - : "=a" (resultvar) \ - : "0" (name) ASM_ARGS_##nr : "memory", "cc", "r11", "cx"); \ - (long) resultvar; }) -# define INTERNAL_SYSCALL(name, err, nr, args...) \ - INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, ##args) -# define INTERNAL_SYSCALL_ERROR_P(val, err) \ - ((unsigned long) (val) >= -4095L) -# define LOAD_ARGS_0() -# define LOAD_REGS_0 -# define ASM_ARGS_0 -# define LOAD_ARGS_1(a1) \ - long int __arg1 = (long) (a1); \ - LOAD_ARGS_0 () -# define LOAD_REGS_1 \ - register long int _a1 asm ("rdi") = __arg1; \ - LOAD_REGS_0 -# define ASM_ARGS_1 ASM_ARGS_0, "r" (_a1) -# define LOAD_ARGS_2(a1, a2) \ - long int __arg2 = (long) (a2); \ - LOAD_ARGS_1 (a1) -# define LOAD_REGS_2 \ - register long int _a2 asm ("rsi") = __arg2; \ - LOAD_REGS_1 -# define ASM_ARGS_2 ASM_ARGS_1, "r" (_a2) -# define LOAD_ARGS_3(a1, a2, a3) \ - long int __arg3 = (long) (a3); \ - LOAD_ARGS_2 (a1, a2) -# define LOAD_REGS_3 \ - register long int _a3 asm ("rdx") = __arg3; \ - LOAD_REGS_2 -# define ASM_ARGS_3 ASM_ARGS_2, "r" (_a3) -#elif defined __powerpc__ -# define INTERNAL_SYSCALL_DECL(err) long int err -# define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ - ({ \ - register long int r0 __asm__ ("r0"); \ - register long int r3 __asm__ ("r3"); \ - register long int r4 __asm__ ("r4"); \ - register long int r5 __asm__ ("r5"); \ - register long int r6 __asm__ ("r6"); \ - register long int r7 __asm__ ("r7"); \ - register long int r8 __asm__ ("r8"); \ - LOADARGS_##nr(name, args); \ - __asm__ __volatile__ \ - ("sc\n\t" \ - "mfcr %0\n\t" \ - : "=&r" (r0), \ - "=&r" (r3), "=&r" (r4), "=&r" (r5), \ - "=&r" (r6), "=&r" (r7), "=&r" (r8) \ - : ASM_INPUT_##nr \ - : "r9", "r10", "r11", "r12", \ - "cr0", "ctr", "memory"); \ - err = r0; \ - (int) r3; \ - }) -# define INTERNAL_SYSCALL(name, err, nr, args...) \ - INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, ##args) -# define INTERNAL_SYSCALL_ERROR_P(val, err) \ - ((void) (val), __builtin_expect ((err) & (1 << 28), 0)) -# define LOADARGS_0(name, dummy) \ - r0 = name -# define LOADARGS_1(name, __arg1) \ - long int arg1 = (long int) (__arg1); \ - LOADARGS_0(name, 0); \ - r3 = arg1 -# define LOADARGS_2(name, __arg1, __arg2) \ - long int arg2 = (long int) (__arg2); \ - LOADARGS_1(name, __arg1); \ - r4 = arg2 -# define LOADARGS_3(name, __arg1, __arg2, __arg3) \ - long int arg3 = (long int) (__arg3); \ - LOADARGS_2(name, __arg1, __arg2); \ - r5 = arg3 -# define ASM_INPUT_0 "0" (r0) -# define ASM_INPUT_1 ASM_INPUT_0, "1" (r3) -# define ASM_INPUT_2 ASM_INPUT_1, "2" (r4) -# define ASM_INPUT_3 ASM_INPUT_2, "3" (r5) -#elif defined __ia64__ -# define DO_INLINE_SYSCALL_NCS(name, nr, args...) \ - LOAD_ARGS_##nr (args) \ - register long _r8 asm ("r8"); \ - register long _r10 asm ("r10"); \ - register long _r15 asm ("r15") = name; \ - long _retval; \ - LOAD_REGS_##nr \ - __asm __volatile ("break 0x100000;;" \ - : "=r" (_r8), "=r" (_r10), "=r" (_r15) \ - ASM_OUTARGS_##nr \ - : "2" (_r15) ASM_ARGS_##nr \ - : "memory" ASM_CLOBBERS_##nr); \ - _retval = _r8; -# define INTERNAL_SYSCALL_DECL(err) long int err -# define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ - ({ \ - DO_INLINE_SYSCALL_NCS (name, nr, args) \ - err = _r10; \ - _retval; }) -# define INTERNAL_SYSCALL(name, err, nr, args...) \ - INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, ##args) -# define INTERNAL_SYSCALL_ERROR_P(val, err) (err == -1) -# define LOAD_ARGS_0() -# define LOAD_REGS_0 -# define LOAD_ARGS_1(a1) \ - long _arg1 = (long) (a1); \ - LOAD_ARGS_0 () -# define LOAD_REGS_1 \ - register long _out0 asm ("out0") = _arg1; \ - LOAD_REGS_0 -# define LOAD_ARGS_2(a1, a2) \ - long _arg2 = (long) (a2); \ - LOAD_ARGS_1 (a1) -# define LOAD_REGS_2 \ - register long _out1 asm ("out1") = _arg2; \ - LOAD_REGS_1 -# define LOAD_ARGS_3(a1, a2, a3) \ - long _arg3 = (long) (a3); \ - LOAD_ARGS_2 (a1, a2) -# define LOAD_REGS_3 \ - register long _out2 asm ("out2") = _arg3; \ - LOAD_REGS_2 -# define ASM_OUTARGS_0 -# define ASM_OUTARGS_1 ASM_OUTARGS_0, "=r" (_out0) -# define ASM_OUTARGS_2 ASM_OUTARGS_1, "=r" (_out1) -# define ASM_OUTARGS_3 ASM_OUTARGS_2, "=r" (_out2) -# define ASM_ARGS_0 -# define ASM_ARGS_1 ASM_ARGS_0, "3" (_out0) -# define ASM_ARGS_2 ASM_ARGS_1, "4" (_out1) -# define ASM_ARGS_3 ASM_ARGS_2, "5" (_out2) -# define ASM_CLOBBERS_0 ASM_CLOBBERS_1, "out0" -# define ASM_CLOBBERS_1 ASM_CLOBBERS_2, "out1" -# define ASM_CLOBBERS_2 ASM_CLOBBERS_3, "out2" -# define ASM_CLOBBERS_3 ASM_CLOBBERS_4, "out3" -# define ASM_CLOBBERS_4 ASM_CLOBBERS_5, "out4" -# define ASM_CLOBBERS_5 ASM_CLOBBERS_6, "out5" -# define ASM_CLOBBERS_6_COMMON , "out6", "out7", \ - /* Non-stacked integer registers, minus r8, r10, r15. */ \ - "r2", "r3", "r9", "r11", "r12", "r13", "r14", "r16", "r17", "r18", \ - "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27", \ - "r28", "r29", "r30", "r31", \ - /* Predicate registers. */ \ - "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15", \ - /* Non-rotating fp registers. */ \ - "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ - /* Branch registers. */ \ - "b6" -# define ASM_CLOBBERS_6 ASM_CLOBBERS_6_COMMON , "b7" -#elif defined __s390__ -# define INTERNAL_SYSCALL_DECL(err) do { } while (0) -# define INTERNAL_SYSCALL_DIRECT(name, err, nr, args...) \ - ({ \ - DECLARGS_##nr(args) \ - register long _ret asm("2"); \ - asm volatile ( \ - "svc %b1\n\t" \ - : "=d" (_ret) \ - : "i" (__NR_##name) ASMFMT_##nr \ - : "memory" ); \ - _ret; }) -# define INTERNAL_SYSCALL_SVC0(name, err, nr, args...) \ - ({ \ - DECLARGS_##nr(args) \ - register unsigned long _nr asm("1") = (unsigned long)(__NR_##name); \ - register long _ret asm("2"); \ - asm volatile ( \ - "svc 0\n\t" \ - : "=d" (_ret) \ - : "d" (_nr) ASMFMT_##nr \ - : "memory" ); \ - _ret; }) -# define INTERNAL_SYSCALL(name, err, nr, args...) \ - (((__NR_##name) < 256) ? \ - INTERNAL_SYSCALL_DIRECT(name, err, nr, args) : \ - INTERNAL_SYSCALL_SVC0(name, err,nr, args)) -# define INTERNAL_SYSCALL_ERROR_P(val, err) \ - ((unsigned long) (val) >= -4095UL) -# define DECLARGS_0() -# define DECLARGS_1(arg1) \ - register unsigned long gpr2 asm ("2") = (unsigned long)(arg1); -# define DECLARGS_2(arg1, arg2) \ - DECLARGS_1(arg1) \ - register unsigned long gpr3 asm ("3") = (unsigned long)(arg2); -# define DECLARGS_3(arg1, arg2, arg3) \ - DECLARGS_2(arg1, arg2) \ - register unsigned long gpr4 asm ("4") = (unsigned long)(arg3); -# define ASMFMT_0 -# define ASMFMT_1 , "0" (gpr2) -# define ASMFMT_2 , "0" (gpr2), "d" (gpr3) -# define ASMFMT_3 , "0" (gpr2), "d" (gpr3), "d" (gpr4) -#elif defined __sparc__ -# ifndef __arch64__ -# define __INTERNAL_SYSCALL_STRING \ - "ta 0x10;" \ - "bcs,a 1f;" \ - " sub %%g0, %%o0, %%o0;" \ - "1:" -# define __SYSCALL_CLOBBERS "g2", "g3", "g4", "g5", "g6", \ - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ - "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ - "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \ - "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \ - "cc", "memory" -# else -# define __INTERNAL_SYSCALL_STRING \ - "ta 0x6d;" \ - "bcs,a,pt %%xcc, 1f;" \ - " sub %%g0, %%o0, %%o0;" \ - "1:" -# define __SYSCALL_CLOBBERS "g2", "g3", "g4", "g5", "g6", \ - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ - "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ - "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \ - "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \ - "f32", "f34", "f36", "f38", "f40", "f42", "f44", "f46", \ - "f48", "f50", "f52", "f54", "f56", "f58", "f60", "f62", \ - "cc", "memory" -# endif -#define INTERNAL_SYSCALL_DECL(err) do { } while (0) -#define INTERNAL_SYSCALL(name, err, nr, args...) \ - inline_syscall##nr(__INTERNAL_SYSCALL_STRING, __NR_##name, args) -#define INTERNAL_SYSCALL_ERROR_P(val, err) \ - ((unsigned long) (val) >= -515L) -# define inline_syscall0(string,name,dummy...) \ -({ \ - register long __o0 __asm__ ("o0"); \ - register long __g1 __asm__ ("g1") = name; \ - __asm __volatile (string : "=r" (__g1), "=r" (__o0) : \ - "0" (__g1) : \ - __SYSCALL_CLOBBERS); \ - __o0; \ -}) -# define inline_syscall1(string,name,arg1) \ -({ \ - register long __o0 __asm__ ("o0") = (long)(arg1); \ - register long __g1 __asm__ ("g1") = name; \ - __asm __volatile (string : "=r" (__g1), "=r" (__o0) : \ - "0" (__g1), "1" (__o0) : \ - __SYSCALL_CLOBBERS); \ - __o0; \ -}) -# define inline_syscall2(string,name,arg1,arg2) \ -({ \ - register long __o0 __asm__ ("o0") = (long)(arg1); \ - register long __o1 __asm__ ("o1") = (long)(arg2); \ - register long __g1 __asm__ ("g1") = name; \ - __asm __volatile (string : "=r" (__g1), "=r" (__o0) : \ - "0" (__g1), "1" (__o0), "r" (__o1) : \ - __SYSCALL_CLOBBERS); \ - __o0; \ -}) -# define inline_syscall3(string,name,arg1,arg2,arg3) \ -({ \ - register long __o0 __asm__ ("o0") = (long)(arg1); \ - register long __o1 __asm__ ("o1") = (long)(arg2); \ - register long __o2 __asm__ ("o2") = (long)(arg3); \ - register long __g1 __asm__ ("g1") = name; \ - __asm __volatile (string : "=r" (__g1), "=r" (__o0) : \ - "0" (__g1), "1" (__o0), "r" (__o1), \ - "r" (__o2) : \ - __SYSCALL_CLOBBERS); \ - __o0; \ -}) -#elif defined __alpha__ -# define INTERNAL_SYSCALL(name, err_out, nr, args...) \ - INTERNAL_SYSCALL1(name, err_out, nr, args) -# define INTERNAL_SYSCALL1(name, err_out, nr, args...) \ - INTERNAL_SYSCALL_NCS(__NR_##name, err_out, nr, args) -# define INTERNAL_SYSCALL_NCS(name, err_out, nr, args...) \ -({ \ - long _sc_ret, _sc_err; \ - inline_syscall##nr(name, args); \ - err_out = _sc_err; \ - _sc_ret; \ -}) -# define INTERNAL_SYSCALL_DECL(err) long int err -# define INTERNAL_SYSCALL_ERROR_P(val, err) err -# define inline_syscall_clobbers \ - "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8", \ - "$22", "$23", "$24", "$25", "$27", "$28", "memory" -# define inline_syscall_r0_asm -# define inline_syscall_r0_out_constraint "=v" -# define inline_syscall0(name, args...) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_19 __asm__("$19"); \ - \ - _sc_0 = name; \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19) \ - : "0"(_sc_0) \ - : inline_syscall_clobbers, \ - "$16", "$17", "$18", "$20", "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} -# define inline_syscall1(name,arg1) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_16 __asm__("$16"); \ - register long _sc_19 __asm__("$19"); \ - \ - _sc_0 = name; \ - _sc_16 = (long) (arg1); \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2 %3" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19), "=r"(_sc_16) \ - : "0"(_sc_0), "2"(_sc_16) \ - : inline_syscall_clobbers, \ - "$17", "$18", "$20", "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} -# define inline_syscall2(name,arg1,arg2) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_16 __asm__("$16"); \ - register long _sc_17 __asm__("$17"); \ - register long _sc_19 __asm__("$19"); \ - \ - _sc_0 = name; \ - _sc_16 = (long) (arg1); \ - _sc_17 = (long) (arg2); \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2 %3 %4" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17) \ - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17) \ - : inline_syscall_clobbers, \ - "$18", "$20", "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} -# define inline_syscall3(name,arg1,arg2,arg3) \ -{ \ - register long _sc_0 inline_syscall_r0_asm; \ - register long _sc_16 __asm__("$16"); \ - register long _sc_17 __asm__("$17"); \ - register long _sc_18 __asm__("$18"); \ - register long _sc_19 __asm__("$19"); \ - \ - _sc_0 = name; \ - _sc_16 = (long) (arg1); \ - _sc_17 = (long) (arg2); \ - _sc_18 = (long) (arg3); \ - __asm__ __volatile__ \ - ("callsys # %0 %1 <= %2 %3 %4 %5" \ - : inline_syscall_r0_out_constraint (_sc_0), \ - "=r"(_sc_19), "=r"(_sc_16), "=r"(_sc_17), \ - "=r"(_sc_18) \ - : "0"(_sc_0), "2"(_sc_16), "3"(_sc_17), \ - "4"(_sc_18) \ - : inline_syscall_clobbers, "$20", "$21"); \ - _sc_ret = _sc_0, _sc_err = _sc_19; \ -} -#elif defined __arm__ && defined __ARM_EABI__ -# define INTERNAL_SYSCALL_DECL(err) do { } while (0) -# define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ - register int _r0 __asm__("r0"); \ - register int _nr __asm__("r7"); \ - LOAD_ARGS_##nr(args) \ - _nr = __NR_##name; \ - asm volatile ("swi\t0\t@ syscall " #name "\n\t" \ - : "=r" (_r0) \ - : "r" (_nr) ASM_ARGS_##nr \ - : "memory"); \ - _r0; }) -# define INTERNAL_SYSCALL_ERROR_P(val, err) \ - ((unsigned int) (val) >= 0xfffff001u) -# define ASM_ARGS_0 -# define ASM_ARGS_1 , "r" (_r0) -# define ASM_ARGS_2 , "r" (_r0), "r" (_r1) -# define ASM_ARGS_3 , "r" (_r0), "r" (_r1), "r" (_r2) -# define LOAD_ARGS_0() -# define LOAD_ARGS_1(r0) \ - _r0 = (int)r0; -# define LOAD_ARGS_2(r0, r1) \ - _r0 = (int)r0; \ - register int _r1 __asm__("r1") = (int)r1; -# define LOAD_ARGS_3(r0, r1, r2) \ - _r0 = (int)r0; \ - register int _r1 __asm__("r1") = (int)r1; \ - register int _r2 __asm__("r2") = (int)r2; -#endif - -int main (int argc, char **argv) -{ - const char *arg[] = { "/sbin/ldconfig", 0 }; - long ret; - INTERNAL_SYSCALL_DECL (err); - ret = INTERNAL_SYSCALL (access, err, 2, arg[0], X_OK); - if (INTERNAL_SYSCALL_ERROR_P (ret, err)) - INTERNAL_SYSCALL (exit, err, 1, 0); - INTERNAL_SYSCALL (execve, err, 3, arg[0], arg, &argv[argc + 1]); - INTERNAL_SYSCALL (exit, err, 1, 110); - return 110; -} - -int __libc_multiple_threads __attribute__((nocommon)); -int __libc_enable_asynccancel (void) { return 0; } -void __libc_disable_asynccancel (int x) { } -void __libc_csu_init (void) { } -void __libc_csu_fini (void) { } -pid_t __fork (void) { return -1; } -char thr_buf[65536]; - -#ifndef __powerpc__ -int __libc_start_main (int (*main) (int argc, char **argv), - int argc, char **argv, - void (*init) (void), void (*fini) (void), - void (*rtld_fini) (void), void * stack_end) -#else -struct startup_info -{ - void *sda_base; - int (*main) (int, char **, char **, void *); - int (*init) (int, char **, char **, void *); - void (*fini) (void); -}; - -int __libc_start_main (int argc, char **argv, char **ev, - void *auxvec, void (*rtld_fini) (void), - struct startup_info *stinfo, - char **stack_on_entry) -#endif -{ -#if defined __ia64__ || defined __powerpc64__ - register void *r13 __asm ("r13") = thr_buf + 32768; - __asm ("" : : "r" (r13)); -#elif defined __sparc__ - register void *g6 __asm ("g6") = thr_buf + 32768; - __thread_self = thr_buf + 32768; - __asm ("" : : "r" (g6), "r" (__thread_self)); -#elif defined __s390__ && !defined __s390x__ - __asm ("sar %%a0,%0" : : "d" (thr_buf + 32768)); -#elif defined __s390x__ - __asm ("sar %%a1,%0; srlg 0,%0,32; sar %%a0,0" : : "d" (thr_buf + 32768) : "0"); -#elif defined __powerpc__ && !defined __powerpc64__ - register void *r2 __asm ("r2") = thr_buf + 32768; - __asm ("" : : "r" (r2)); -#endif -#ifdef __powerpc__ - argc = (long)*stack_on_entry; - argv = stack_on_entry + 1; -#endif - main (argc, argv); - return 110; -} diff -ruN gcc-4.4.5-6.el6.src.rpm-rpmbuild/SPECS/gcc.spec gcc-4.4.5-6.el6.0.src.rpm-rpmbuild/SPECS/gcc.spec --- gcc-4.4.5-6.el6.src.rpm-rpmbuild/SPECS/gcc.spec 2011-02-14 20:52:10.000000000 +0000 +++ gcc-4.4.5-6.el6.0.src.rpm-rpmbuild/SPECS/gcc.spec 2011-08-15 16:57:56.000000000 +0100 @@ -40,7 +40,7 @@ Name: gcc %global gcc_version 4.4.4 Version: 4.4.5 -Release: %{gcc_release}%{?dist} +Release: %{gcc_release}%{?dist}.0 %if "%{version}" != "%{gcc_version}" %define gcc_provides %{gcc_version}-15%{?dist} %endif @@ -53,7 +53,6 @@ # svn export svn://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_4-branch@%{SVNREV} gcc-%{version}-%{DATE} # tar cf - gcc-%{version}-%{DATE} | bzip2 -9 > gcc-%{version}-%{DATE}.tar.bz2 Source0: gcc-%{version}-%{DATE}.tar.bz2 -Source1: libgcc_post_upgrade.c Source2: README.libgcjwebplugin.so Source3: protoize.1 %global fastjar_ver 0.97 @@ -185,6 +184,9 @@ Patch1003: fastjar-CVE-2010-0831.patch Patch1004: fastjar-man.patch +Patch10001: gcc44-deb621083-arm-triplet-backport.patch +#Patch10003: gcc44-libgcc-fno-stack-protector.patch + # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. %ifnarch %{arm} @@ -602,6 +604,9 @@ %patch1003 -p0 -b .fastjar-CVE-2010-0831~ %patch1004 -p0 -b .fastjar-man~ +%patch10001 -p2 -b .gcc44-deb621083-arm-triplet-backport~ +#%patch10003 -p1 -b .gcc44-libgcc-fno-stack-protector~ + %if %{bootstrap_java} tar xjf %{SOURCE10} %endif @@ -1022,6 +1027,13 @@ OUTPUT_FORMAT(elf32-powerpc) GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/32/libgcc_s.so %endif +%ifarch %{arm} +rm -f $FULLPATH/libgcc_s.so +echo '/* GNU ld script + Use the shared library, but some functions are only in + the static library. */ +GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so +%endif mv -f %{buildroot}%{_prefix}/%{_lib}/libgomp.spec $FULLPATH/ @@ -1266,10 +1278,6 @@ EOF chmod 755 %{buildroot}%{_prefix}/bin/c?9 -mkdir -p %{buildroot}%{_prefix}/sbin -gcc -static -Os %{SOURCE1} -o %{buildroot}%{_prefix}/sbin/libgcc_post_upgrade -strip %{buildroot}%{_prefix}/sbin/libgcc_post_upgrade - %if "%{version}" != "%{gcc_version}" mv -f $RPM_BUILD_ROOT%{_prefix}/libexec/gcc/%{gcc_target_platform}/{%{version},%{gcc_version}} ln -sf %{gcc_version} $RPM_BUILD_ROOT%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{version} @@ -1422,7 +1430,25 @@ # Because glibc Prereq's libgcc and /sbin/ldconfig # comes from glibc, it might not exist yet when # libgcc is installed -%post -n libgcc -p %{_prefix}/sbin/libgcc_post_upgrade +%post -n libgcc -p +if posix.access ("/sbin/ldconfig", "x") then + local pid = posix.fork () + if pid == 0 then + posix.exec ("/sbin/ldconfig") + elseif pid ~= -1 then + posix.wait (pid) + end +end + +%postun -n libgcc -p +if posix.access ("/sbin/ldconfig", "x") then + local pid = posix.fork () + if pid == 0 then + posix.exec ("/sbin/ldconfig") + elseif pid ~= -1 then + posix.wait (pid) + end +end %post -n libstdc++ -p /sbin/ldconfig @@ -1629,7 +1655,6 @@ %defattr(-,root,root,-) /%{_lib}/libgcc_s-%{version}-%{DATE}.so.1 /%{_lib}/libgcc_s.so.1 -%{_prefix}/sbin/libgcc_post_upgrade %doc gcc/COPYING.LIB %files c++ @@ -2173,6 +2198,12 @@ %endif %changelog +* Mon Aug 15 2011 Gordan Bobic 4.4.5-6 +- Add ports and spec file patches from F13 GCC RPM +- Add triplet patch for ARM (Debian #621083) +- Replace libgcc_post_upgrade.c with lua scriptlet (#723054) +- libgcc_s.so symlink fix for ARM. + * Mon Feb 14 2011 Jakub Jelinek 4.4.5-6 - update from gcc-4_4-branch - PRs c++/45894, c++/47589, fortran/47569, libstdc++/47354,