Ignore:
Timestamp:
Apr 16, 2011, 2:33:52 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
2643b9b4
Parents:
7b0cc7e8 (diff), af891d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into simp

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/gcc-4.6.0-pure64-1.patch

    r7b0cc7e8 raf43a09  
    11Submitted By: Joe Ciccone <jciccone@gmail.com>
    2 Date: 01-08-2011
     2Date: 04-16-2011
    33Initial Package Version: 3.4.6
    44Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
    … …  
    99
    1010    Rediffed Against 4.5.2 By Pontus Carlsson <PontusCarlsson at live dot se>
     11    Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com>
    1112
    12 diff -Naur gcc-4.5.2.orig/gcc/config/i386/linux64.h gcc-4.5.2/gcc/config/i386/linux64.h
    13 --- gcc-4.5.2.orig/gcc/config/i386/linux64.h    2010-03-24 16:44:48.000000000 -0400
    14 +++ gcc-4.5.2/gcc/config/i386/linux64.h 2011-01-08 13:41:39.814665253 -0500
    15 @@ -58,8 +58,8 @@
     13diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h
     14--- gcc-4.6.0.orig/gcc/config/i386/linux64.h    2011-03-02 17:35:36.000000000 -0500
     15+++ gcc-4.6.0/gcc/config/i386/linux64.h 2011-04-16 15:49:02.335213604 -0400
     16@@ -62,8 +62,8 @@
    1617    When the -shared link option is used a final link is not being
    1718    done.  */
    … …  
    2425 #if TARGET_64BIT_DEFAULT
    2526 #define SPEC_32 "m32"
    26 diff -Naur gcc-4.5.2.orig/gcc/config/i386/t-linux64 gcc-4.5.2/gcc/config/i386/t-linux64
    27 --- gcc-4.5.2.orig/gcc/config/i386/t-linux64    2009-04-21 15:03:23.000000000 -0400
    28 +++ gcc-4.5.2/gcc/config/i386/t-linux64 2011-01-08 13:41:39.814665253 -0500
     27diff -Naur gcc-4.6.0.orig/gcc/config/i386/t-linux64 gcc-4.6.0/gcc/config/i386/t-linux64
     28--- gcc-4.6.0.orig/gcc/config/i386/t-linux64    2009-04-21 15:03:23.000000000 -0400
     29+++ gcc-4.6.0/gcc/config/i386/t-linux64 2011-04-16 15:49:02.335213604 -0400
    2930@@ -25,7 +25,7 @@
    3031 
    … …  
    3637 LIBGCC = stmp-multilib
    3738 INSTALL_LIBGCC = install-multilib
    38 diff -Naur gcc-4.5.2.orig/gcc/config/linux.h gcc-4.5.2/gcc/config/linux.h
    39 --- gcc-4.5.2.orig/gcc/config/linux.h   2009-04-09 11:00:19.000000000 -0400
    40 +++ gcc-4.5.2/gcc/config/linux.h        2011-01-08 13:41:39.814665253 -0500
    41 @@ -118,7 +118,7 @@
     39diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h
     40--- gcc-4.6.0.orig/gcc/config/linux.h   2011-01-12 09:29:14.000000000 -0500
     41+++ gcc-4.6.0/gcc/config/linux.h        2011-04-16 15:49:02.335213604 -0400
     42@@ -75,7 +75,7 @@
    4243    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    4344    supporting both 32-bit and 64-bit compilation.  */
    … …  
    4647+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
    4748 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    48  #define LINUX_DYNAMIC_LINKER \
    49    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
    50 diff -Naur gcc-4.5.2.orig/gcc/config/mips/linux64.h gcc-4.5.2/gcc/config/mips/linux64.h
    51 --- gcc-4.5.2.orig/gcc/config/mips/linux64.h    2009-02-20 10:20:38.000000000 -0500
    52 +++ gcc-4.5.2/gcc/config/mips/linux64.h 2011-01-08 13:41:39.814665253 -0500
     49 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
     50 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
     51diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h
     52--- gcc-4.6.0.orig/gcc/config/mips/linux64.h    2011-01-19 15:39:09.000000000 -0500
     53+++ gcc-4.6.0/gcc/config/mips/linux64.h 2011-04-16 15:50:00.807213626 -0400
    5354@@ -35,10 +35,10 @@
    5455 %{!shared: \
    … …  
    6364+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
    6465+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
     66 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
    6567 #define LINUX_DYNAMIC_LINKERN32 \
    66    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
    67  
    68 diff -Naur gcc-4.5.2.orig/gcc/config/mips/t-linux64 gcc-4.5.2/gcc/config/mips/t-linux64
    69 --- gcc-4.5.2.orig/gcc/config/mips/t-linux64    2009-04-21 15:03:23.000000000 -0400
    70 +++ gcc-4.5.2/gcc/config/mips/t-linux64 2011-01-08 13:41:39.814665253 -0500
     68   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
     69diff -Naur gcc-4.6.0.orig/gcc/config/mips/t-linux64 gcc-4.6.0/gcc/config/mips/t-linux64
     70--- gcc-4.6.0.orig/gcc/config/mips/t-linux64    2009-04-21 15:03:23.000000000 -0400
     71+++ gcc-4.6.0/gcc/config/mips/t-linux64 2011-04-16 15:49:02.335213604 -0400
    7172@@ -18,7 +18,7 @@
    7273 
    … …  
    7879 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
    7980 
    80 diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/linux64.h gcc-4.5.2/gcc/config/rs6000/linux64.h
    81 --- gcc-4.5.2.orig/gcc/config/rs6000/linux64.h  2010-11-17 01:09:53.000000000 -0500
    82 +++ gcc-4.5.2/gcc/config/rs6000/linux64.h       2011-01-08 13:41:39.814665253 -0500
    83 @@ -340,9 +340,9 @@
     81diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h
     82--- gcc-4.6.0.orig/gcc/config/rs6000/linux64.h  2011-03-07 02:50:23.000000000 -0500
     83+++ gcc-4.6.0/gcc/config/rs6000/linux64.h       2011-04-16 15:49:02.335213604 -0400
     84@@ -372,9 +372,9 @@
    8485 #undef LINK_OS_DEFAULT_SPEC
    8586 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
    … …  
    9293+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
    9394 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    94  #if UCLIBC_DEFAULT
    95  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    96 diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/t-linux64 gcc-4.5.2/gcc/config/rs6000/t-linux64
    97 --- gcc-4.5.2.orig/gcc/config/rs6000/t-linux64  2009-04-21 15:03:23.000000000 -0400
    98 +++ gcc-4.5.2/gcc/config/rs6000/t-linux64       2011-01-08 13:41:39.814665253 -0500
     95 #if DEFAULT_LIBC == LIBC_UCLIBC
     96 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
     97diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 gcc-4.6.0/gcc/config/rs6000/t-linux64
     98--- gcc-4.6.0.orig/gcc/config/rs6000/t-linux64  2009-04-21 15:03:23.000000000 -0400
     99+++ gcc-4.6.0/gcc/config/rs6000/t-linux64       2011-04-16 15:49:02.335213604 -0400
    99100@@ -36,7 +36,7 @@
    100101 MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
    … …  
    106107 
    107108 softfp_wrap_start := '\#ifndef __powerpc64__'
    108 diff -Naur gcc-4.5.2.orig/gcc/config/s390/linux.h gcc-4.5.2/gcc/config/s390/linux.h
    109 --- gcc-4.5.2.orig/gcc/config/s390/linux.h      2007-08-02 06:49:31.000000000 -0400
    110 +++ gcc-4.5.2/gcc/config/s390/linux.h   2011-01-08 13:41:39.814665253 -0500
     109diff -Naur gcc-4.6.0.orig/gcc/config/s390/linux.h gcc-4.6.0/gcc/config/s390/linux.h
     110--- gcc-4.6.0.orig/gcc/config/s390/linux.h      2010-12-09 08:27:07.000000000 -0500
     111+++ gcc-4.6.0/gcc/config/s390/linux.h   2011-04-16 15:49:02.335213604 -0400
    111112@@ -72,7 +72,7 @@
    112113 #define MULTILIB_DEFAULTS { "m31" }
    … …  
    118119 
    119120 #undef  LINK_SPEC
    120 diff -Naur gcc-4.5.2.orig/gcc/config/s390/t-linux64 gcc-4.5.2/gcc/config/s390/t-linux64
    121 --- gcc-4.5.2.orig/gcc/config/s390/t-linux64    2010-10-04 12:54:26.000000000 -0400
    122 +++ gcc-4.5.2/gcc/config/s390/t-linux64 2011-01-08 13:41:51.762743997 -0500
     121diff -Naur gcc-4.6.0.orig/gcc/config/s390/t-linux64 gcc-4.6.0/gcc/config/s390/t-linux64
     122--- gcc-4.6.0.orig/gcc/config/s390/t-linux64    2010-10-04 12:51:59.000000000 -0400
     123+++ gcc-4.6.0/gcc/config/s390/t-linux64 2011-04-16 15:49:02.335213604 -0400
    123124@@ -7,4 +7,4 @@
    124125 
    … …  
    127128-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
    128129+MULTILIB_OSDIRNAMES = ../lib ../lib32
    129 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/linux.h gcc-4.5.2/gcc/config/sparc/linux.h
    130 --- gcc-4.5.2.orig/gcc/config/sparc/linux.h     2010-09-22 17:15:37.000000000 -0400
    131 +++ gcc-4.5.2/gcc/config/sparc/linux.h  2011-01-08 13:41:39.814665253 -0500
    132 @@ -86,7 +86,7 @@
     130diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/linux.h
     131--- gcc-4.6.0.orig/gcc/config/sparc/linux.h     2011-01-26 15:30:12.000000000 -0500
     132+++ gcc-4.6.0/gcc/config/sparc/linux.h  2011-04-16 15:49:02.335213604 -0400
     133@@ -74,7 +74,7 @@
    133134 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
    134135 
    … …  
    138139   %{!mno-relax:%{!r:-relax}} \
    139140   %{!shared: \
    140      %{!ibcs: \
    141 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/linux64.h gcc-4.5.2/gcc/config/sparc/linux64.h
    142 --- gcc-4.5.2.orig/gcc/config/sparc/linux64.h   2010-09-22 17:15:37.000000000 -0400
    143 +++ gcc-4.5.2/gcc/config/sparc/linux64.h        2011-01-08 13:41:39.814665253 -0500
    144 @@ -109,8 +109,8 @@
    145  
    146  /* If ELF is the default format, we should not use /lib/elf.  */
     141     %{!static: \
     142diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h
     143--- gcc-4.6.0.orig/gcc/config/sparc/linux64.h   2011-02-17 08:57:21.000000000 -0500
     144+++ gcc-4.6.0/gcc/config/sparc/linux64.h        2011-04-16 15:49:02.335213604 -0400
     145@@ -101,8 +101,8 @@
     146    When the -shared link option is used a final link is not being
     147    done.  */
    147148 
    148149-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
    … …  
    153154 #ifdef SPARC_BI_ARCH
    154155 
    155 @@ -121,7 +121,7 @@
     156@@ -113,7 +113,7 @@
    156157   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },       \
    157158   { "link_arch",        LINK_ARCH_SPEC },
    … …  
    160161+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/lib32 %{shared:-shared} \
    161162   %{!shared: \
    162      %{!ibcs: \
    163        %{!static: \
    164 @@ -130,7 +130,7 @@
    165          %{static:-static}}} \
     163     %{!static: \
     164       %{rdynamic:-export-dynamic} \
     165@@ -121,7 +121,7 @@
     166       %{static:-static}} \
    166167 "
    167168 
    … …  
    169170+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
    170171   %{!shared: \
    171      %{!ibcs: \
    172        %{!static: \
    173 @@ -211,7 +211,7 @@
     172     %{!static: \
     173       %{rdynamic:-export-dynamic} \
     174@@ -193,7 +193,7 @@
    174175 #else /* !SPARC_BI_ARCH */
    175176 
    … …  
    178179+#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
    179180   %{!shared: \
    180      %{!ibcs: \
    181        %{!static: \
    182 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/t-linux64 gcc-4.5.2/gcc/config/sparc/t-linux64
    183 --- gcc-4.5.2.orig/gcc/config/sparc/t-linux64   2010-10-04 12:54:26.000000000 -0400
    184 +++ gcc-4.5.2/gcc/config/sparc/t-linux64        2011-01-08 13:42:07.870657323 -0500
     181     %{!static: \
     182       %{rdynamic:-export-dynamic} \
     183diff -Naur gcc-4.6.0.orig/gcc/config/sparc/t-linux64 gcc-4.6.0/gcc/config/sparc/t-linux64
     184--- gcc-4.6.0.orig/gcc/config/sparc/t-linux64   2011-01-03 15:52:22.000000000 -0500
     185+++ gcc-4.6.0/gcc/config/sparc/t-linux64        2011-04-16 15:49:02.335213604 -0400
    185186@@ -26,7 +26,7 @@
    186187 
Note: See TracChangeset for help on using the changeset viewer.