Temporary workaround for gcc7 and arm64
See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/461597.html
This commit is contained in:
		
							parent
							
								
									94ee8d4cda
								
							
						
					
					
						commit
						fd6460a8d8
					
				
							
								
								
									
										62
									
								
								0001-Work-around-for-gcc7-and-arm64.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										62
									
								
								0001-Work-around-for-gcc7-and-arm64.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,62 @@ | ||||
| From 975dcf140bd307b431aff7b6d671155c796cfe5e Mon Sep 17 00:00:00 2001 | ||||
| From: Laura Abbott <labbott@redhat.com> | ||||
| Date: Sat, 28 Jan 2017 16:13:49 +0100 | ||||
| Subject: [PATCH] Work around for gcc7 and  arm64 | ||||
| 
 | ||||
| Originally proposed by Will Deacon <will.deacon@arm.com> | ||||
| 
 | ||||
| http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/462224.html | ||||
| 
 | ||||
| Signed-off-by: Laura Abbott <labbott@redhat.com> | ||||
| ---
 | ||||
|  include/linux/log2.h | 13 ++----------- | ||||
|  1 file changed, 2 insertions(+), 11 deletions(-) | ||||
| 
 | ||||
| diff --git a/include/linux/log2.h b/include/linux/log2.h
 | ||||
| index fd7ff3d91e6a..1ab22b79681e 100644
 | ||||
| --- a/include/linux/log2.h
 | ||||
| +++ b/include/linux/log2.h
 | ||||
| @@ -16,12 +16,6 @@
 | ||||
|  #include <linux/bitops.h> | ||||
|   | ||||
|  /* | ||||
| - * deal with unrepresentable constant logarithms
 | ||||
| - */
 | ||||
| -extern __attribute__((const, noreturn))
 | ||||
| -int ____ilog2_NaN(void);
 | ||||
| -
 | ||||
| -/*
 | ||||
|   * non-constant log of base 2 calculators | ||||
|   * - the arch may override these in asm/bitops.h if they can be implemented | ||||
|   *   more efficiently than using fls() and fls64() | ||||
| @@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
 | ||||
|  #define ilog2(n)				\ | ||||
|  (						\ | ||||
|  	__builtin_constant_p(n) ? (		\ | ||||
| -		(n) < 1 ? ____ilog2_NaN() :	\
 | ||||
| +		(n) < 1 ? 0 :	\
 | ||||
|  		(n) & (1ULL << 63) ? 63 :	\ | ||||
|  		(n) & (1ULL << 62) ? 62 :	\ | ||||
|  		(n) & (1ULL << 61) ? 61 :	\ | ||||
| @@ -149,9 +143,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
 | ||||
|  		(n) & (1ULL <<  3) ?  3 :	\ | ||||
|  		(n) & (1ULL <<  2) ?  2 :	\ | ||||
|  		(n) & (1ULL <<  1) ?  1 :	\ | ||||
| -		(n) & (1ULL <<  0) ?  0 :	\
 | ||||
| -		____ilog2_NaN()			\
 | ||||
| -				   ) :		\
 | ||||
| +		0 ) :		\
 | ||||
|  	(sizeof(n) <= 4) ?			\ | ||||
|  	__ilog2_u32(n) :			\ | ||||
|  	__ilog2_u64(n)				\ | ||||
| @@ -194,7 +186,6 @@ unsigned long __rounddown_pow_of_two(unsigned long n)
 | ||||
|   * @n: parameter | ||||
|   * | ||||
|   * The first few values calculated by this routine: | ||||
| - *  ob2(0) = 0
 | ||||
|   *  ob2(1) = 0 | ||||
|   *  ob2(2) = 1 | ||||
|   *  ob2(3) = 2 | ||||
| -- 
 | ||||
| 2.11.0 | ||||
| 
 | ||||
| @ -42,7 +42,7 @@ Summary: The Linux kernel | ||||
| # For non-released -rc kernels, this will be appended after the rcX and | ||||
| # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" | ||||
| # | ||||
| %global baserelease 1 | ||||
| %global baserelease 2 | ||||
| %global fedora_build %{baserelease} | ||||
| 
 | ||||
| # base_sublevel is the kernel version we're starting with and patching | ||||
| @ -593,6 +593,9 @@ Patch851: Armada-trace-build-fix.patch | ||||
| # selinux: allow context mounts on tmpfs, ramfs, devpts within user namespaces | ||||
| Patch852: selinux-allow-context-mounts-on-tmpfs-etc.patch | ||||
| 
 | ||||
| # See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/461597.html | ||||
| Patch853: 0001-Work-around-for-gcc7-and-arm64.patch | ||||
| 
 | ||||
| # END OF PATCH DEFINITIONS | ||||
| 
 | ||||
| %endif | ||||
| @ -2163,6 +2166,9 @@ fi | ||||
| # | ||||
| # | ||||
| %changelog | ||||
| * Sat Jan 28 2017 Laura Abbott <labbott@redhat.com> - 4.10.0-0.rc5.git4.2 | ||||
| - Temporary workaround for gcc7 and arm64 | ||||
| 
 | ||||
| * Fri Jan 27 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc5.git4.1 | ||||
| - Linux v4.10-rc5-367-g1b1bc42 | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user