[patch] linux-mod-respect-KERNEL_ABI.patch

linux-mod-respect-KERNEL_ABI.patch (text/plain), 2.29 KB, created by Robin Johnson on 2006-06-29 23:59:04 UTC

Index: eclass/linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.66
diff -u -3 -p -w -b -B -r1.66 linux-mod.eclass
--- eclass/linux-mod.eclass	20 Jun 2006 19:47:37 -0000	1.66
+++ eclass/linux-mod.eclass	30 Jun 2006 06:58:11 -0000
@@ -276,6 +276,19 @@ set_kvobj() {
 	# einfo "Using KV_OBJ=${KV_OBJ}"
 }
 
+get-KERNEL_CC() {
+	local kernel_cc
+	if [ -n "${KERNEL_ABI}" ]; then
+		# In future, an arch might want to define CC_$ABI
+		#kernel_cc="$(get_abi_CC)"
+		#[ -z "${kernel_cc}" ] && 
+		kernel_cc="$(tc-getCC $(ABI=${KERNEL_ABI} get_abi_CHOST))"
+	else
+		kernel_cc=$(tc-getCC)
+	fi
+	echo "${kernel_cc}"
+}
+
 generate_modulesd() {
 	# This function will generate the neccessary modules.d file from the
 	# information contained in the modules exported parms
@@ -485,7 +498,7 @@ linux-mod_src_compile() {
 	ARCH="$(tc-arch-kernel)"
 	ABI="${KERNEL_ABI}"
 	CC_HOSTCC=$(tc-getBUILD_CC)
-	CC_CC=$(tc-getCC)
+	CC_CC=$(get-KERNEL_CC)
 
 	BUILD_TARGETS=${BUILD_TARGETS:-clean module}
 	strip_modulenames;
@@ -510,7 +523,7 @@ linux-mod_src_compile() {
 				die "Unable to run econf ${ECONF_PARAMS}"
 			fi
 
-			emake HOSTCC=${CC_HOSTCC} CC=${CC_CC}\
+			emake HOSTCC=${CC_HOSTCC} CC=${CC_CC} LDFLAGS="$(get_abi_LDFLAGS)" \
 				  ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS} \
 				|| die "Unable to make ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}."
 			touch ${srcdir}/.built
Index: profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/make.defaults,v
retrieving revision 1.2
diff -u -3 -p -w -b -B -r1.2 make.defaults
--- profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/make.defaults	27 Jun 2006 17:55:19 -0000	1.2
+++ profiles/default-linux/ppc/ppc64/2006.0/32bit-userland/make.defaults	30 Jun 2006 06:58:11 -0000
@@ -5,6 +5,14 @@ ACCEPT_KEYWORDS="${ARCH}"
 CHOST="powerpc-unknown-linux-gnu"
 PROFILE_ARCH="ppc64"
 
+KERNEL_ABI="ppc64"
+#DEFAULT_ABI="ppc"
+
+LDFLAGS_ppc64="-m elf64ppc"
+CHOST_ppc64="powerpc64-unknown-linux-gnu"
+#LDFLAGS_ppc="-m elf32ppc"
+#CHOST_ppc="powerpc-unknown-linux-gnu"
+
 CFLAGS="-O2 -pipe"
 CXXFLAGS=${CFLAGS}