summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-07-09 04:24:20 +0000
committerMike Frysinger <vapier@gentoo.org>2007-07-09 04:24:20 +0000
commit850bc93ed68b578da19002dd033fa0c06cd232f2 (patch)
treed532eeb9f545b45f7fa9b4a82e21ad942c9cd7f9 /eclass
parentStable for HPPA (bug #184605). (diff)
downloadhistorical-850bc93ed68b578da19002dd033fa0c06cd232f2.tar.gz
historical-850bc93ed68b578da19002dd033fa0c06cd232f2.tar.bz2
historical-850bc93ed68b578da19002dd033fa0c06cd232f2.zip
also convert asm and volatile to __asm__ and __volatile__ #182414
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kernel-2.eclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index f62013250dbd..a0fc1b9dde56 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.204 2007/04/25 18:24:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.205 2007/07/09 04:24:20 vapier Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -990,11 +990,13 @@ echo "#ifdef __arch64__
headers___fix() {
# Voodoo to partially fix broken upstream headers.
- # Issues with this function should go to toolchain.
+ # note: do not put inline/asm/volatile together (breaks "inline asm volatile")
sed -i \
-e '/^\#define.*_TYPES_H/{:loop n; bloop}' \
-e 's:\<\([us]\(8\|16\|32\|64\)\)\>:__\1:g' \
- -e "s/ inline / __inline__ /g" \
+ -e "s/\([[:space:]]\)inline\([[:space:](]\)/\1__inline__\2/g" \
+ -e "s/\([[:space:]]\)asm\([[:space:](]\)/\1__asm__\2/g" \
+ -e "s/\([[:space:]]\)volatile\([[:space:](]\)/\1__volatile__\2/g" \
"$@"
}