From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Landley Subject: [PATCH 3/3]: Convert mkcapflags.pl to mkcapflags.sh Date: Fri, 2 Jan 2009 02:15:36 -0600 Message-ID: <200901020215.37223.rob@landley.net> References: <200901020207.30359.rob@landley.net> Mime-Version: 1.0 Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <200901020207.30359.rob@landley.net> Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Embedded Linux mailing list Cc: linux-kernel@vger.kernel.org, Andrew Morton , "H. Peter Anvin" , Sam Ravnborg RnJvbTogUm9iIExhbmRsZXkgPHJvYkBsYW5kbGV5Lm5ldD4KCkNvbnZlcnQga2VybmVsL2NwdS9t a2NhcGZsYWdzLnBsIHRvIGtlcm5lbC9jcHUvbWtjYXBmbGFncy5zaC4KClRoaXMgc2NyaXB0IGdl bmVyYXRlcyBrZXJuZWwvY3B1L2NhcGZsYWdzLmMgZnJvbSBpbmNsdWRlL2FzbS9jcHVmZWF0dXJl LmguCgpQZXRlciBBbnZpbiBhZGRlZCB0aGlzIHBlcmwgdG8gMi42LjI4LgoKU2lnbmVkLW9mZi1i eTogUm9iIExhbmRsZXkgPHJvYkBsYW5kbGV5Lm5ldD4KLS0tCgogYXJjaC94ODYva2VybmVsL2Nw dS9NYWtlZmlsZSAgICAgIHwgICAgNCArLS0KIGFyY2gveDg2L2tlcm5lbC9jcHUvbWtjYXBmbGFn cy5wbCB8ICAgMzIgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogYXJjaC94ODYva2VybmVs L2NwdS9ta2NhcGZsYWdzLnNoIHwgICAyOCArKysrKysrKysrKysrKysrKysrKysrKysKIDMgZmls ZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC1ydU4g YWx0LWxpbnV4L2FyY2gveDg2L2tlcm5lbC9jcHUvTWFrZWZpbGUgYWx0LWxpbnV4Mi9hcmNoL3g4 Ni9rZXJuZWwvY3B1L01ha2VmaWxlCi0tLSBhbHQtbGludXgvYXJjaC94ODYva2VybmVsL2NwdS9N YWtlZmlsZQkyMDA4LTEyLTI0IDE3OjI2OjM3LjAwMDAwMDAwMCAtMDYwMAorKysgYWx0LWxpbnV4 Mi9hcmNoL3g4Ni9rZXJuZWwvY3B1L01ha2VmaWxlCTIwMDgtMTItMjggMTg6MTA6NTEuMDAwMDAw MDAwIC0wNjAwCkBAIC0yMywxMCArMjMsMTAgQEAKIG9iai0kKENPTkZJR19YODZfTE9DQUxfQVBJ QykgKz0gcGVyZmN0ci13YXRjaGRvZy5vCiAKIHF1aWV0X2NtZF9ta2NhcGZsYWdzID0gTUtDQVAg ICAkQAotICAgICAgY21kX21rY2FwZmxhZ3MgPSAkKFBFUkwpICQoc3JjdHJlZSkvJChzcmMpL21r Y2FwZmxhZ3MucGwgJDwgJEAKKyAgICAgIGNtZF9ta2NhcGZsYWdzID0gJChDT05GSUdfU0hFTEwp ICQoc3JjdHJlZSkvJChzcmMpL21rY2FwZmxhZ3Muc2ggJDwgJEAKIAogY3B1ZmVhdHVyZSA9ICQo c3JjKS8uLi8uLi9pbmNsdWRlL2FzbS9jcHVmZWF0dXJlLmgKIAogdGFyZ2V0cyArPSBjYXBmbGFn cy5jCi0kKG9iaikvY2FwZmxhZ3MuYzogJChjcHVmZWF0dXJlKSAkKHNyYykvbWtjYXBmbGFncy5w bCBGT1JDRQorJChvYmopL2NhcGZsYWdzLmM6ICQoY3B1ZmVhdHVyZSkgJChzcmMpL21rY2FwZmxh Z3Muc2ggRk9SQ0UKIAkkKGNhbGwgaWZfY2hhbmdlZCxta2NhcGZsYWdzKQpkaWZmIC1ydU4gYWx0 LWxpbnV4L2FyY2gveDg2L2tlcm5lbC9jcHUvbWtjYXBmbGFncy5wbCBhbHQtbGludXgyL2FyY2gv eDg2L2tlcm5lbC9jcHUvbWtjYXBmbGFncy5wbAotLS0gYWx0LWxpbnV4L2FyY2gveDg2L2tlcm5l bC9jcHUvbWtjYXBmbGFncy5wbAkyMDA4LTEyLTI0IDE3OjI2OjM3LjAwMDAwMDAwMCAtMDYwMAor KysgYWx0LWxpbnV4Mi9hcmNoL3g4Ni9rZXJuZWwvY3B1L21rY2FwZmxhZ3MucGwJMTk2OS0xMi0z MSAxODowMDowMC4wMDAwMDAwMDAgLTA2MDAKQEAgLTEsMzIgKzAsMCBAQAotIyEvdXNyL2Jpbi9w ZXJsCi0jCi0jIEdlbmVyYXRlIHRoZSB4ODZfY2FwX2ZsYWdzW10gYXJyYXkgZnJvbSBpbmNsdWRl L2FzbS14ODYvY3B1ZmVhdHVyZS5oCi0jCi0KLSgkaW4sICRvdXQpID0gQEFSR1Y7Ci0KLW9wZW4o SU4sICI8ICRpblwwIikgICBvciBkaWUgIiQwOiBjYW5ub3Qgb3BlbjogJGluOiAkIVxuIjsKLW9w ZW4oT1VULCAiPiAkb3V0XDAiKSBvciBkaWUgIiQwOiBjYW5ub3QgY3JlYXRlOiAkb3V0OiAkIVxu IjsKLQotcHJpbnQgT1VUICIjaW5jbHVkZSA8YXNtL2NwdWZlYXR1cmUuaD5cblxuIjsKLXByaW50 IE9VVCAiY29uc3QgY2hhciAqIGNvbnN0IHg4Nl9jYXBfZmxhZ3NbTkNBUElOVFMqMzJdID0ge1xu IjsKLQotd2hpbGUgKGRlZmluZWQoJGxpbmUgPSA8SU4+KSkgewotCWlmICgkbGluZSA9fiAvXlxz KlwjXHMqZGVmaW5lXHMrKFg4Nl9GRUFUVVJFXyhcUyspKVxzKyguKikkLykgewotCQkkbWFjcm8g PSAkMTsKLQkJJGZlYXR1cmUgPSAkMjsKLQkJJHRhaWwgPSAkMzsKLQkJaWYgKCR0YWlsID1+IC9c L1wqXHMqXCIoW14iXSopXCIuKlwqXC8vKSB7Ci0JCQkkZmVhdHVyZSA9ICQxOwotCQl9Ci0KLQkJ aWYgKCRmZWF0dXJlIG5lICcnKSB7Ci0JCQlwcmludGYgT1VUICJcdCUtMzJzID0gXCIlc1wiLFxu IiwKLQkJCQkiWyRtYWNyb10iLCAiXEwkZmVhdHVyZSI7Ci0JCX0KLQl9Ci19Ci1wcmludCBPVVQg In07XG4iOwotCi1jbG9zZShJTik7Ci1jbG9zZShPVVQpOwpkaWZmIC1ydU4gYWx0LWxpbnV4L2Fy Y2gveDg2L2tlcm5lbC9jcHUvbWtjYXBmbGFncy5zaCBhbHQtbGludXgyL2FyY2gveDg2L2tlcm5l bC9jcHUvbWtjYXBmbGFncy5zaAotLS0gYWx0LWxpbnV4L2FyY2gveDg2L2tlcm5lbC9jcHUvbWtj YXBmbGFncy5zaAkxOTY5LTEyLTMxIDE4OjAwOjAwLjAwMDAwMDAwMCAtMDYwMAorKysgYWx0LWxp bnV4Mi9hcmNoL3g4Ni9rZXJuZWwvY3B1L21rY2FwZmxhZ3Muc2gJMjAwOC0xMi0yOCAxODowODo1 MC4wMDAwMDAwMDAgLTA2MDAKQEAgLTAsMCArMSwyOCBAQAorIyEvYmluL2Jhc2gKKyMKKyMgR2Vu ZXJhdGUgdGhlIHg4Nl9jYXBfZmxhZ3NbXSBhcnJheSBmcm9tIGluY2x1ZGUvYXNtL2NwdWZlYXR1 cmUuaAorIworCitJTj0kMQorT1VUPSQyCisKKygKKwllY2hvICIjaW5jbHVkZSA8YXNtL2NwdWZl YXR1cmUuaD4iCisJZWNobyAiIgorCWVjaG8gImNvbnN0IGNoYXIgKiBjb25zdCB4ODZfY2FwX2Zs YWdzW05DQVBJTlRTKjMyXSA9IHsiCisKKwkjIEl0ZXJhdGUgdGhyb3VnaCBhbnkgaW5wdXQgbGlu ZXMgc3RhcnRpbmcgd2l0aCAjZGVmaW5lIFg4Nl9GRUFUVVJFXworCXNlZCAtbiAtZSAncy9cdC8g L2cnIC1lICdzL14gKiMgKmRlZmluZSAqWDg2X0ZFQVRVUkVfLy9wJyAkSU4gfAorCXdoaWxlIHJl YWQgaQorCWRvCisJCSMgTmFtZSBpcyBldmVyeXRoaW5nIHVwIHRvIHRoZSBmaXJzdCB3aGl0ZXNw YWNlCisJCU5BTUU9IiQoZWNobyAiJGkiIHwgc2VkICdzLyAuKi8vJykiCisKKwkJIyBJZiB0aGUg LyogY29tbWVudCAqLyBzdGFydHMgd2l0aCBhIHF1b3RlIHN0cmluZywgZ3JhYiB0aGF0LgorCQlW QUxVRT0iJChlY2hvICIkaSIgfCBzZWQgLW4gJ3NALiovXCogKlwoIlteIl0qIlwpLipcKi9AXDFA cCcpIgorCQlbIC16ICIkVkFMVUUiIF0gJiYgVkFMVUU9IlwiJChlY2hvICIkTkFNRSIgfCB0ciBB LVogYS16KVwiIgorCisJCVsgIiRWQUxVRSIgIT0gJyIiJyBdICYmIGVjaG8gIglbWDg2X0ZFQVRV UkVfJE5BTUVdID0gJFZBTFVFLCIKKwlkb25lCisJZWNobyAifTsiCispID4gJE9VVAoACg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757513AbZABIPx (ORCPT ); Fri, 2 Jan 2009 03:15:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753669AbZABIPm (ORCPT ); Fri, 2 Jan 2009 03:15:42 -0500 Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5]:41928 "EHLO grelber.thyrsus.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752414AbZABIPl (ORCPT ); Fri, 2 Jan 2009 03:15:41 -0500 From: Rob Landley Organization: Boundaries Unlimited To: Embedded Linux mailing list Subject: [PATCH 3/3]: Convert mkcapflags.pl to mkcapflags.sh Date: Fri, 2 Jan 2009 02:15:36 -0600 User-Agent: KMail/1.10.1 (Linux/2.6.27-7-generic; KDE/4.1.2; x86_64; ; ) Cc: linux-kernel@vger.kernel.org, Andrew Morton , "H. Peter Anvin" , Sam Ravnborg References: <200901020207.30359.rob@landley.net> In-Reply-To: <200901020207.30359.rob@landley.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: inline Message-Id: <200901020215.37223.rob@landley.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id n028H2wM012193 From: Rob Landley Convert kernel/cpu/mkcapflags.pl to kernel/cpu/mkcapflags.sh. This script generates kernel/cpu/capflags.c from include/asm/cpufeature.h. Peter Anvin added this perl to 2.6.28. Signed-off-by: Rob Landley --- arch/x86/kernel/cpu/Makefile | 4 +-- arch/x86/kernel/cpu/mkcapflags.pl | 32 ---------------------------- arch/x86/kernel/cpu/mkcapflags.sh | 28 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 34 deletions(-) diff -ruN alt-linux/arch/x86/kernel/cpu/Makefile alt-linux2/arch/x86/kernel/cpu/Makefile--- alt-linux/arch/x86/kernel/cpu/Makefile 2008-12-24 17:26:37.000000000 -0600+++ alt-linux2/arch/x86/kernel/cpu/Makefile 2008-12-28 18:10:51.000000000 -0600@@ -23,10 +23,10 @@ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o quiet_cmd_mkcapflags = MKCAP $@- cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@+ cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $< $@ cpufeature = $(src)/../../include/asm/cpufeature.h targets += capflags.c-$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE+$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE $(call if_changed,mkcapflags)diff -ruN alt-linux/arch/x86/kernel/cpu/mkcapflags.pl alt-linux2/arch/x86/kernel/cpu/mkcapflags.pl--- alt-linux/arch/x86/kernel/cpu/mkcapflags.pl 2008-12-24 17:26:37.000000000 -0600+++ alt-linux2/arch/x86/kernel/cpu/mkcapflags.pl 1969-12-31 18:00:00.000000000 -0600@@ -1,32 +0,0 @@-#!/usr/bin/perl-#-# Generate the x86_cap_flags[] array from include/asm-x86/cpufeature.h-#--($in, $out) = @ARGV;--open(IN, "< $in\0") or die "$0: cannot open: $in: $!\n";-open(OUT, "> $out\0") or die "$0: cannot create: $out: $!\n";--print OUT "#include \n\n";-print OUT "const char * const x86_cap_flags[NCAPINTS*32] = {\n";--while (defined($line = )) {- if ($line =~ /^\s*\#\s*define\s+(X86_FEATURE_(\S+))\s+(.*)$/) {- $macro = $1;- $feature = $2;- $tail = $3;- if ($tail =~ /\/\*\s*\"([^"]*)\".*\*\//) {- $feature = $1;- }-- if ($feature ne '') {- printf OUT "\t%-32s = \"%s\",\n",- "[$macro]", "\L$feature";- }- }-}-print OUT "};\n";--close(IN);-close(OUT);diff -ruN alt-linux/arch/x86/kernel/cpu/mkcapflags.sh alt-linux2/arch/x86/kernel/cpu/mkcapflags.sh--- alt-linux/arch/x86/kernel/cpu/mkcapflags.sh 1969-12-31 18:00:00.000000000 -0600+++ alt-linux2/arch/x86/kernel/cpu/mkcapflags.sh 2008-12-28 18:08:50.000000000 -0600@@ -0,0 +1,28 @@+#!/bin/bash+#+# Generate the x86_cap_flags[] array from include/asm/cpufeature.h+#++IN=$1+OUT=$2++(+ echo "#include "+ echo ""+ echo "const char * const x86_cap_flags[NCAPINTS*32] = {"++ # Iterate through any input lines starting with #define X86_FEATURE_+ sed -n -e 's/\t/ /g' -e 's/^ *# *define *X86_FEATURE_//p' $IN |+ while read i+ do+ # Name is everything up to the first whitespace+ NAME="$(echo "$i" | sed 's/ .*//')"++ # If the /* comment */ starts with a quote string, grab that.+ VALUE="$(echo "$i" | sed -n 's@.*/\* *\("[^"]*"\).*\*/@\1@p')"+ [ -z "$VALUE" ] && VALUE="\"$(echo "$NAME" | tr A-Z a-z)\""++ [ "$VALUE" != '""' ] && echo " [X86_FEATURE_$NAME] = $VALUE,"+ done+ echo "};"+) > $OUT{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I