mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	upgrade to gcc 4.4.7
SVN-Revision: 31230
This commit is contained in:
		
							parent
							
								
									c3bc38689c
								
							
						
					
					
						commit
						ca6859aa29
					
				@ -2,13 +2,13 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
choice
 | 
					choice
 | 
				
			||||||
	prompt "GCC compiler Version" if TOOLCHAINOPTS
 | 
						prompt "GCC compiler Version" if TOOLCHAINOPTS
 | 
				
			||||||
	default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
 | 
						default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
 | 
				
			||||||
	default GCC_VERSION_4_6_LINARO
 | 
						default GCC_VERSION_4_6_LINARO
 | 
				
			||||||
	help
 | 
						help
 | 
				
			||||||
	  Select the version of gcc you wish to use.
 | 
						  Select the version of gcc you wish to use.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	config GCC_VERSION_4_4_6
 | 
						config GCC_VERSION_4_4_7
 | 
				
			||||||
		bool "gcc 4.4.6"
 | 
							bool "gcc 4.4.7"
 | 
				
			||||||
		depends (avr32 || ubicom32)
 | 
							depends (avr32 || ubicom32)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	config GCC_VERSION_4_6_2
 | 
						config GCC_VERSION_4_6_2
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
config GCC_DEFAULT_VERSION
 | 
					config GCC_DEFAULT_VERSION
 | 
				
			||||||
	bool
 | 
						bool
 | 
				
			||||||
 | 
					
 | 
				
			||||||
config GCC_DEFAULT_VERSION_4_4_6
 | 
					config GCC_DEFAULT_VERSION_4_4_7
 | 
				
			||||||
	select GCC_DEFAULT_VERSION
 | 
						select GCC_DEFAULT_VERSION
 | 
				
			||||||
	default y if (avr32 || ubicom32)
 | 
						default y if (avr32 || ubicom32)
 | 
				
			||||||
	bool
 | 
						bool
 | 
				
			||||||
@ -13,7 +13,7 @@ config GCC_DEFAULT_VERSION_4_6_LINARO
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
config GCC_VERSION
 | 
					config GCC_VERSION
 | 
				
			||||||
	string
 | 
						string
 | 
				
			||||||
	default "4.4.6"	    if GCC_VERSION_4_4_6
 | 
						default "4.4.7"	    if GCC_VERSION_4_4_7
 | 
				
			||||||
	default "4.6.2"	    if GCC_VERSION_4_6_2
 | 
						default "4.6.2"	    if GCC_VERSION_4_6_2
 | 
				
			||||||
	default "4.7.0"	    if GCC_VERSION_4_7_0
 | 
						default "4.7.0"	    if GCC_VERSION_4_7_0
 | 
				
			||||||
	default "4.5-linaro"    if GCC_VERSION_4_5_LINARO
 | 
						default "4.5-linaro"    if GCC_VERSION_4_5_LINARO
 | 
				
			||||||
@ -23,7 +23,7 @@ config GCC_VERSION
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
config GCC_VERSION_4_4
 | 
					config GCC_VERSION_4_4
 | 
				
			||||||
	bool
 | 
						bool
 | 
				
			||||||
	default y	if GCC_VERSION_4_4_6
 | 
						default y	if GCC_VERSION_4_4_7
 | 
				
			||||||
 | 
					
 | 
				
			||||||
config GCC_VERSION_4_5
 | 
					config GCC_VERSION_4_5
 | 
				
			||||||
	bool
 | 
						bool
 | 
				
			||||||
@ -39,8 +39,8 @@ config GCC_VERSION_4_7
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
if !TOOLCHAINOPTS
 | 
					if !TOOLCHAINOPTS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	config GCC_VERSION_4_4_6
 | 
						config GCC_VERSION_4_4_7
 | 
				
			||||||
		default y if GCC_DEFAULT_VERSION_4_4_6
 | 
							default y if GCC_DEFAULT_VERSION_4_4_7
 | 
				
			||||||
		bool
 | 
							bool
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	config GCC_VERSION_4_6_LINARO
 | 
						config GCC_VERSION_4_6_LINARO
 | 
				
			||||||
 | 
				
			|||||||
@ -57,8 +57,8 @@ else
 | 
				
			|||||||
  PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
 | 
					  PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
 | 
				
			||||||
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 | 
					  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  ifeq ($(PKG_VERSION),4.4.6)
 | 
					  ifeq ($(PKG_VERSION),4.4.7)
 | 
				
			||||||
    PKG_MD5SUM:=ab525d429ee4425050a554bc9247d6c4
 | 
					    PKG_MD5SUM:=295709feb4441b04e87dea3f1bab4281
 | 
				
			||||||
  endif
 | 
					  endif
 | 
				
			||||||
  ifeq ($(PKG_VERSION),4.6.2)
 | 
					  ifeq ($(PKG_VERSION),4.6.2)
 | 
				
			||||||
    PKG_MD5SUM:=028115c4fbfb6cfd75d6369f4a90d87e
 | 
					    PKG_MD5SUM:=028115c4fbfb6cfd75d6369f4a90d87e
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
--- a/configure
 | 
					--- a/configure
 | 
				
			||||||
+++ b/configure
 | 
					+++ b/configure
 | 
				
			||||||
@@ -2688,6 +2688,9 @@ case "${target}" in
 | 
					@@ -2690,6 +2690,9 @@ case "${target}" in
 | 
				
			||||||
   ip2k-*-*)
 | 
					   ip2k-*-*)
 | 
				
			||||||
     noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
 | 
					     noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
 | 
				
			||||||
     ;;
 | 
					     ;;
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user