diff options
author | Mike Pagano <mpagano@gentoo.org> | 2008-07-18 01:49:18 +0000 |
---|---|---|
committer | Mike Pagano <mpagano@gentoo.org> | 2008-07-18 01:49:18 +0000 |
commit | d141dfd997faaf803d5688624d756c5fe50568d0 (patch) | |
tree | e5a71ca1d5c7472e2eaf0a65093a5089e5a87cbf /sys-kernel/git-sources/files | |
parent | Stable for HPPA (bug #231975). (diff) | |
download | historical-d141dfd997faaf803d5688624d756c5fe50568d0.tar.gz historical-d141dfd997faaf803d5688624d756c5fe50568d0.tar.bz2 historical-d141dfd997faaf803d5688624d756c5fe50568d0.zip |
Version bump
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26 i686
Diffstat (limited to 'sys-kernel/git-sources/files')
-rw-r--r-- | sys-kernel/git-sources/files/git-sources-2.6.26-r6-arch_ppc_makefile.patch | 194 |
1 files changed, 194 insertions, 0 deletions
diff --git a/sys-kernel/git-sources/files/git-sources-2.6.26-r6-arch_ppc_makefile.patch b/sys-kernel/git-sources/files/git-sources-2.6.26-r6-arch_ppc_makefile.patch new file mode 100644 index 000000000000..9ddc45b8281b --- /dev/null +++ b/sys-kernel/git-sources/files/git-sources-2.6.26-r6-arch_ppc_makefile.patch @@ -0,0 +1,194 @@ +--- patch-2.6.26-git6.orig 2008-07-17 20:21:09.000000000 -0400 ++++ patch-2.6.26-git6 2008-07-17 20:21:45.000000000 -0400 +@@ -152231,49 +152231,6 @@ index f94b877..0000000 + - default y + - + -endmenu +-diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile +-deleted file mode 100644 +-index 500497e..0000000 +---- a/arch/ppc/boot/Makefile +-+++ /dev/null +-@@ -1,37 +0,0 @@ +--# +--# arch/ppc/boot/Makefile +--# +--# This file is included by the global makefile so that you can add your own +--# architecture-specific flags and dependencies. +--# +--# This file is subject to the terms and conditions of the GNU General Public +--# License. See the file "COPYING" in the main directory of this archive +--# for more details. +--# +--# Copyright (C) 1994 by Linus Torvalds +--# Adapted for PowerPC by Gary Thomas +--# modified by Cort (cort@cs.nmt.edu) +--# +-- +--# KBUILD_CFLAGS used when building rest of boot (takes effect recursively) +--KBUILD_CFLAGS += -fno-builtin -D__BOOTER__ -Iarch/$(ARCH)/boot/include +--HOSTCFLAGS += -Iarch/$(ARCH)/boot/include +-- +--BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd +-- +--bootdir-y := simple +--subdir-y := lib common images +--subdir-$(CONFIG_PPC_PREP) += of1275 +-- +--# for cleaning +--subdir- += simple +-- +--hostprogs-y := $(addprefix utils/, mkprep mkbugboot mktree) +-- +--PHONY += $(BOOT_TARGETS) $(bootdir-y) +-- +--$(BOOT_TARGETS): $(bootdir-y) +-- +--$(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \ +-- $(addprefix $(obj)/,$(hostprogs-y)) +-- $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS) + diff --git a/arch/ppc/boot/common/Makefile b/arch/ppc/boot/common/Makefile + deleted file mode 100644 + index a2e85e3..0000000 +@@ -852743,3 +852700,141 @@ index 2d29e26..d4eae6a 100644 + kvm_arch_hardware_unsetup(); + kvm_arch_exit(); + kvm_exit_debug(); ++--- linux-2.6.26-git6/arch/ppc/Makefile 2008-07-17 20:14:37.000000000 -0400 +++++ /dev/null 2008-07-17 01:31:14.812005950 -0400 ++@@ -1,135 +0,0 @@ ++-# This file is included by the global makefile so that you can add your own ++-# architecture-specific flags and dependencies. ++-# ++-# This file is subject to the terms and conditions of the GNU General Public ++-# License. See the file "COPYING" in the main directory of this archive ++-# for more details. ++-# ++-# Copyright (C) 1994 by Linus Torvalds ++-# Changes for PPC by Gary Thomas ++-# Rewritten by Cort Dougan and Paul Mackerras ++-# ++- ++-# This must match PAGE_OFFSET in include/asm-ppc/page.h. ++-KERNELLOAD := $(CONFIG_KERNEL_START) ++- ++-HAS_BIARCH := $(call cc-option-yn, -m32) ++-ifeq ($(HAS_BIARCH),y) ++-AS := $(AS) -a32 ++-LD := $(LD) -m elf32ppc ++-CC := $(CC) -m32 ++-endif ++- ++-LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic ++-# The -Iarch/$(ARCH)/include is temporary while we are merging ++-KBUILD_CPPFLAGS += -Iarch/$(ARCH) -Iarch/$(ARCH)/include ++-KBUILD_AFLAGS += -Iarch/$(ARCH) ++-KBUILD_CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe \ ++- -ffixed-r2 -mmultiple ++- ++-# No AltiVec instruction when building kernel ++-KBUILD_CFLAGS += $(call cc-option, -mno-altivec) ++- ++-CPP = $(CC) -E $(KBUILD_CFLAGS) ++-# Temporary hack until we have migrated to asm-powerpc ++-LINUXINCLUDE += -Iarch/$(ARCH)/include ++- ++-CHECKFLAGS += -D__powerpc__ ++- ++-cpu-as-$(CONFIG_4xx) += -Wa,-m405 ++-cpu-as-$(CONFIG_6xx) += -Wa,-maltivec ++- ++-KBUILD_AFLAGS += $(cpu-as-y) ++-KBUILD_CFLAGS += $(cpu-as-y) ++- ++-# Default to the common case. ++-KBUILD_DEFCONFIG := ebony_defconfig ++- ++-head-y := arch/ppc/kernel/head.o ++-head-$(CONFIG_8xx) := arch/ppc/kernel/head_8xx.o ++-head-$(CONFIG_4xx) := arch/ppc/kernel/head_4xx.o ++-head-$(CONFIG_44x) := arch/ppc/kernel/head_44x.o ++- ++-head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o ++- ++-core-y += arch/ppc/kernel/ arch/powerpc/kernel/ \ ++- arch/ppc/platforms/ \ ++- arch/ppc/mm/ arch/ppc/lib/ \ ++- arch/ppc/syslib/ arch/powerpc/sysdev/ \ ++- arch/powerpc/lib/ ++-core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/ ++-core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/ ++-core-$(CONFIG_XMON) += arch/ppc/xmon/ ++-drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ ++-drivers-$(CONFIG_4xx) += arch/ppc/4xx_io/ ++-drivers-$(CONFIG_CPM2) += arch/ppc/8260_io/ ++- ++-drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ ++- ++-BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm ++- ++-PHONY += $(BOOT_TARGETS) ++- ++-all: uImage zImage ++- ++-CPPFLAGS_vmlinux.lds := -Upowerpc ++- ++-# All the instructions talk about "make bzImage". ++-bzImage: zImage ++- ++-boot := arch/$(ARCH)/boot ++- ++-$(BOOT_TARGETS): vmlinux ++- $(Q)$(MAKE) $(build)=$(boot) $@ ++- ++-uImage: vmlinux ++- $(Q)$(MAKE) $(build)=$(boot)/images $(boot)/images/$@ ++- ++-define archhelp ++- @echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/images/zImage.*)' ++- @echo ' uImage - Create a bootable image for U-Boot / PPCBoot' ++- @echo ' install - Install kernel using' ++- @echo ' (your) ~/bin/installkernel or' ++- @echo ' (distribution) /sbin/installkernel or' ++- @echo ' install to $$(INSTALL_PATH) and run lilo' ++- @echo ' *_defconfig - Select default config from arch/$(ARCH)/ppc/configs' ++-endef ++- ++-archclean: ++- $(Q)$(MAKE) $(clean)=arch/ppc/boot ++- # Temporary hack until we have migrated to asm-powerpc ++- $(Q)rm -rf arch/$(ARCH)/include ++- ++-archprepare: checkbin ++- ++-# Temporary hack until we have migrated to asm-powerpc ++-include/asm: arch/$(ARCH)/include/asm ++-arch/$(ARCH)/include/asm: ++- $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi ++- $(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm ++- ++-# Use the file '.tmp_gas_check' for binutils tests, as gas won't output ++-# to stdout and these checks are run even on install targets. ++-TOUT := $(T).tmp_gas_check ++-# Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec ++-# instructions. ++-# gcc-3.4 and binutils-2.14 are a fatal combination. ++- ++-checkbin: ++- @if test "$(call cc-version)" = "0304" ; then \ ++- if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \ ++- echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \ ++- echo 'correctly with gcc-3.4 and your version of binutils.'; \ ++- echo '*** Please upgrade your binutils or downgrade your gcc'; \ ++- false; \ ++- fi ; \ ++- fi ++- @if ! /bin/echo dssall | $(AS) -many -o $(TOUT) >/dev/null 2>&1 ; then \ ++- echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build ' ; \ ++- echo 'correctly with old versions of binutils.' ; \ ++- echo '*** Please upgrade your binutils to 2.12.1 or newer' ; \ ++- false ; \ ++- fi ++- ++-CLEAN_FILES += $(TOUT) ++- |