diff options
| author | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-09-23 12:15:30 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-09-23 12:15:30 -0400 |
| commit | 9e0d2f655e4b18a995d14107e7f7289f4e8aa65d (patch) | |
| tree | 8f82e705260ef6c89d7a781f7d99783277806b13 | |
| parent | 6406b98a0e3692eba8739976e7143363c5cc394c (diff) | |
| download | kernel-9e0d2f655e4b18a995d14107e7f7289f4e8aa65d.tar.gz kernel-9e0d2f655e4b18a995d14107e7f7289f4e8aa65d.tar.xz kernel-9e0d2f655e4b18a995d14107e7f7289f4e8aa65d.zip | |
Add s390 vdso AFTER_LINK to Roland's linux-2.6-makefile-after_link.patch
| -rw-r--r-- | kernel.spec | 3 | ||||
| -rw-r--r-- | linux-2.6-makefile-after_link.patch | 29 |
2 files changed, 32 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 38c505ecc..e9c66ac6b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1923,6 +1923,9 @@ fi %changelog * Thu Sep 23 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.25.rc5 +- Add s390 vdso AFTER_LINK to Roland's linux-2.6-makefile-after_link.patch + +* Thu Sep 23 2010 Kyle McMartin <kyle@redhat.com> - Snipe ACPI patch from mjg59 to fix battery levels on some laptops. * Tue Sep 21 2010 Kyle McMartin <kyle@redhat.com> diff --git a/linux-2.6-makefile-after_link.patch b/linux-2.6-makefile-after_link.patch index 239e49aff..c2541b1d8 100644 --- a/linux-2.6-makefile-after_link.patch +++ b/linux-2.6-makefile-after_link.patch @@ -67,3 +67,32 @@ index 4a2afa1..12ad9f7 100644 VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) GCOV_PROFILE := n + +diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile +index d13e875..28a3e1ad 100644 +--- a/arch/s390/kernel/vdso32/Makefile ++++ b/arch/s390/kernel/vdso32/Makefile +@@ -40,7 +40,8 @@ $(obj-vdso32): %.o: %.S + + # actual build commands + quiet_cmd_vdso32ld = VDSO32L $@ +- cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ ++ cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ \ ++ $(if $(AFTER_LINK),; $(AFTER_LINK)) + quiet_cmd_vdso32as = VDSO32A $@ + cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $< + +diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile +index 449352d..e90e656 100644 +--- a/arch/s390/kernel/vdso64/Makefile ++++ b/arch/s390/kernel/vdso64/Makefile +@@ -40,7 +40,8 @@ $(obj-vdso64): %.o: %.S + + # actual build commands + quiet_cmd_vdso64ld = VDSO64L $@ +- cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ ++ cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ \ ++ $(if $(AFTER_LINK),; $(AFTER_LINK)) + quiet_cmd_vdso64as = VDSO64A $@ + cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< + |