Commit 0c05384a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  mkuboot.sh: Fail if mkimage is missing
  gen_init_cpio: checkpatch fixes
  gen_init_cpio: Avoid race between call to stat() and call to open()
  modpost: Fix address calculation in reloc_location()
  Make fixdep error handling more explicit
  checksyscalls: Fix stand-alone usage
  modpost: Put .zdebug* section on white list
  kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
  kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
  kbuild: introduce HDR_ARCH_LIST for headers_install_all
  headers_install: check exit status of unifdef
  gen_init_cpio: remove leading `/' from file names
  scripts/genksyms: fix header usage
  fixdep: use hash table instead of a single array
parents 1542dec1 bc91c9f3
...@@ -39,8 +39,9 @@ INSTALL_HDR_PATH indicates where to install the headers. It defaults to ...@@ -39,8 +39,9 @@ INSTALL_HDR_PATH indicates where to install the headers. It defaults to
The command "make headers_install_all" exports headers for all architectures The command "make headers_install_all" exports headers for all architectures
simultaneously. (This is mostly of interest to distribution maintainers, simultaneously. (This is mostly of interest to distribution maintainers,
who create an architecture-independent tarball from the resulting include who create an architecture-independent tarball from the resulting include
directory.) Remember to provide the appropriate linux/asm directory via "mv" directory.) You also can use HDR_ARCH_LIST to specify list of architectures.
or "ln -s" before building a C library with headers exported this way. Remember to provide the appropriate linux/asm directory via "mv" or "ln -s"
before building a C library with headers exported this way.
The kernel header export infrastructure is maintained by David Woodhouse The kernel header export infrastructure is maintained by David Woodhouse
<dwmw2@infradead.org>. <dwmw2@infradead.org>.
...@@ -224,6 +224,7 @@ ifeq ($(ARCH),m68knommu) ...@@ -224,6 +224,7 @@ ifeq ($(ARCH),m68knommu)
endif endif
KCONFIG_CONFIG ?= .config KCONFIG_CONFIG ?= .config
export KCONFIG_CONFIG
# SHELL used by kbuild # SHELL used by kbuild
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
......
...@@ -20,15 +20,18 @@ header-y += wimax/ ...@@ -20,15 +20,18 @@ header-y += wimax/
objhdr-y += version.h objhdr-y += version.h
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \ ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
$(srctree)/include/asm-$(SRCARCH)/a.out.h),) $(srctree)/include/asm-$(SRCARCH)/a.out.h \
$(INSTALL_HDR_PATH)/include/asm-*/a.out.h),)
header-y += a.out.h header-y += a.out.h
endif endif
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \ ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
$(srctree)/include/asm-$(SRCARCH)/kvm.h),) $(srctree)/include/asm-$(SRCARCH)/kvm.h \
$(INSTALL_HDR_PATH)/include/asm-*/kvm.h),)
header-y += kvm.h header-y += kvm.h
endif endif
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \ ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
$(srctree)/include/asm-$(SRCARCH)/kvm_para.h),) $(srctree)/include/asm-$(SRCARCH)/kvm_para.h \
$(INSTALL_HDR_PATH)/include/asm-*/kvm_para.h),)
header-y += kvm_para.h header-y += kvm_para.h
endif endif
......
...@@ -121,7 +121,7 @@ $(obj)/configs.o: $(obj)/config_data.h ...@@ -121,7 +121,7 @@ $(obj)/configs.o: $(obj)/config_data.h
# config_data.h contains the same information as ikconfig.h but gzipped. # config_data.h contains the same information as ikconfig.h but gzipped.
# Info from config_data can be extracted from /proc/config* # Info from config_data can be extracted from /proc/config*
targets += config_data.gz targets += config_data.gz
$(obj)/config_data.gz: .config FORCE $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE
$(call if_changed,gzip) $(call if_changed,gzip)
quiet_cmd_ikconfiggz = IKCFG $@ quiet_cmd_ikconfiggz = IKCFG $@
......
...@@ -138,38 +138,36 @@ static void print_cmdline(void) ...@@ -138,38 +138,36 @@ static void print_cmdline(void)
printf("cmd_%s := %s\n\n", target, cmdline); printf("cmd_%s := %s\n\n", target, cmdline);
} }
char * str_config = NULL; struct item {
int size_config = 0; struct item *next;
int len_config = 0; unsigned int len;
unsigned int hash;
char name[0];
};
/* #define HASHSZ 256
* Grow the configuration string to a desired length. static struct item *hashtab[HASHSZ];
* Usually the first growth is plenty.
*/
static void grow_config(int len)
{
while (len_config + len > size_config) {
if (size_config == 0)
size_config = 2048;
str_config = realloc(str_config, size_config *= 2);
if (str_config == NULL)
{ perror("fixdep:malloc"); exit(1); }
}
}
static unsigned int strhash(const char *str, unsigned int sz)
{
/* fnv32 hash */
unsigned int i, hash = 2166136261U;
for (i = 0; i < sz; i++)
hash = (hash ^ str[i]) * 0x01000193;
return hash;
}
/* /*
* Lookup a value in the configuration string. * Lookup a value in the configuration string.
*/ */
static int is_defined_config(const char * name, int len) static int is_defined_config(const char *name, int len, unsigned int hash)
{ {
const char * pconfig; struct item *aux;
const char * plast = str_config + len_config - len;
for ( pconfig = str_config + 1; pconfig < plast; pconfig++ ) { for (aux = hashtab[hash % HASHSZ]; aux; aux = aux->next) {
if (pconfig[ -1] == '\n' if (aux->hash == hash && aux->len == len &&
&& pconfig[len] == '\n' memcmp(aux->name, name, len) == 0)
&& !memcmp(pconfig, name, len))
return 1; return 1;
} }
return 0; return 0;
...@@ -178,13 +176,19 @@ static int is_defined_config(const char * name, int len) ...@@ -178,13 +176,19 @@ static int is_defined_config(const char * name, int len)
/* /*
* Add a new value to the configuration string. * Add a new value to the configuration string.
*/ */
static void define_config(const char * name, int len) static void define_config(const char *name, int len, unsigned int hash)
{ {
grow_config(len + 1); struct item *aux = malloc(sizeof(*aux) + len);
memcpy(str_config+len_config, name, len); if (!aux) {
len_config += len; perror("fixdep:malloc");
str_config[len_config++] = '\n'; exit(1);
}
memcpy(aux->name, name, len);
aux->len = len;
aux->hash = hash;
aux->next = hashtab[hash % HASHSZ];
hashtab[hash % HASHSZ] = aux;
} }
/* /*
...@@ -192,40 +196,49 @@ static void define_config(const char * name, int len) ...@@ -192,40 +196,49 @@ static void define_config(const char * name, int len)
*/ */
static void clear_config(void) static void clear_config(void)
{ {
len_config = 0; struct item *aux, *next;
define_config("", 0); unsigned int i;
for (i = 0; i < HASHSZ; i++) {
for (aux = hashtab[i]; aux; aux = next) {
next = aux->next;
free(aux);
}
hashtab[i] = NULL;
}
} }
/* /*
* Record the use of a CONFIG_* word. * Record the use of a CONFIG_* word.
*/ */
static void use_config(char *m, int slen) static void use_config(const char *m, int slen)
{ {
char s[PATH_MAX]; unsigned int hash = strhash(m, slen);
char *p; int c, i;
if (is_defined_config(m, slen)) if (is_defined_config(m, slen, hash))
return; return;
define_config(m, slen); define_config(m, slen, hash);
memcpy(s, m, slen); s[slen] = 0; printf(" $(wildcard include/config/");
for (i = 0; i < slen; i++) {
for (p = s; p < s + slen; p++) { c = m[i];
if (*p == '_') if (c == '_')
*p = '/'; c = '/';
else else
*p = tolower((int)*p); c = tolower(c);
putchar(c);
} }
printf(" $(wildcard include/config/%s.h) \\\n", s); printf(".h) \\\n");
} }
static void parse_config_file(char *map, size_t len) static void parse_config_file(const char *map, size_t len)
{ {
int *end = (int *) (map + len); const int *end = (const int *) (map + len);
/* start at +1, so that p can never be < map */ /* start at +1, so that p can never be < map */
int *m = (int *) map + 1; const int *m = (const int *) map + 1;
char *p, *q; const char *p, *q;
for (; m < end; m++) { for (; m < end; m++) {
if (*m == INT_CONF) { p = (char *) m ; goto conf; } if (*m == INT_CONF) { p = (char *) m ; goto conf; }
...@@ -265,7 +278,7 @@ static int strrcmp(char *s, char *sub) ...@@ -265,7 +278,7 @@ static int strrcmp(char *s, char *sub)
return memcmp(s + slen - sublen, sub, sublen); return memcmp(s + slen - sublen, sub, sublen);
} }
static void do_config_file(char *filename) static void do_config_file(const char *filename)
{ {
struct stat st; struct stat st;
int fd; int fd;
...@@ -273,7 +286,7 @@ static void do_config_file(char *filename) ...@@ -273,7 +286,7 @@ static void do_config_file(char *filename)
fd = open(filename, O_RDONLY); fd = open(filename, O_RDONLY);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "fixdep: "); fprintf(stderr, "fixdep: error opening config file: ");
perror(filename); perror(filename);
exit(2); exit(2);
} }
...@@ -344,11 +357,15 @@ static void print_deps(void) ...@@ -344,11 +357,15 @@ static void print_deps(void)
fd = open(depfile, O_RDONLY); fd = open(depfile, O_RDONLY);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "fixdep: "); fprintf(stderr, "fixdep: error opening depfile: ");
perror(depfile); perror(depfile);
exit(2); exit(2);
} }
fstat(fd, &st); if (fstat(fd, &st) < 0) {
fprintf(stderr, "fixdep: error fstat'ing depfile: ");
perror(depfile);
exit(2);
}
if (st.st_size == 0) { if (st.st_size == 0) {
fprintf(stderr,"fixdep: %s is empty\n",depfile); fprintf(stderr,"fixdep: %s is empty\n",depfile);
close(fd); close(fd);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# and listed below so they are ignored. # and listed below so they are ignored.
# #
# Usage: # Usage:
# syscallchk gcc gcc-options # checksyscalls.sh gcc gcc-options
# #
ignore_list() { ignore_list() {
...@@ -204,5 +204,5 @@ sed -n -e '/^\#define/ s/[^_]*__NR_\([^[:space:]]*\).*/\ ...@@ -204,5 +204,5 @@ sed -n -e '/^\#define/ s/[^_]*__NR_\([^[:space:]]*\).*/\
\#endif/p' $1 \#endif/p' $1
} }
(ignore_list && syscall_list ${srctree}/arch/x86/include/asm/unistd_32.h) | \ (ignore_list && syscall_list $(dirname $0)/../arch/x86/include/asm/unistd_32.h) | \
$* -E -x c - > /dev/null $* -E -x c - > /dev/null
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
#include <assert.h> #include <assert.h>
#include <malloc.h> #include <stdlib.h>
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%{ %{
#include <assert.h> #include <assert.h>
#include <malloc.h> #include <stdlib.h>
#include "genksyms.h" #include "genksyms.h"
static int is_typedef; static int is_typedef;
......
...@@ -13,7 +13,7 @@ do_command() ...@@ -13,7 +13,7 @@ do_command()
fi fi
} }
archs=$(ls ${srctree}/arch) archs=${HDR_ARCH_LIST:-$(ls ${srctree}/arch)}
for arch in ${archs}; do for arch in ${archs}; do
case ${arch} in case ${arch} in
......
...@@ -45,6 +45,13 @@ foreach my $file (@files) { ...@@ -45,6 +45,13 @@ foreach my $file (@files) {
close $in; close $in;
system $unifdef . " $tmpfile > $installdir/$file"; system $unifdef . " $tmpfile > $installdir/$file";
# unifdef will exit 0 on success, and will exit 1 when the
# file was processed successfully but no changes were made,
# so abort only when it's higher than that.
my $e = $? >> 8;
if ($e > 1) {
die "$tmpfile: $!\n";
}
unlink $tmpfile; unlink $tmpfile;
} }
exit 0; exit 0;
...@@ -11,7 +11,7 @@ if [ -z "${MKIMAGE}" ]; then ...@@ -11,7 +11,7 @@ if [ -z "${MKIMAGE}" ]; then
if [ -z "${MKIMAGE}" ]; then if [ -z "${MKIMAGE}" ]; then
# Doesn't exist # Doesn't exist
echo '"mkimage" command not found - U-Boot images will not be built' >&2 echo '"mkimage" command not found - U-Boot images will not be built' >&2
exit 0; exit 1;
fi fi
fi fi
......
...@@ -790,6 +790,7 @@ static const char *section_white_list[] = ...@@ -790,6 +790,7 @@ static const char *section_white_list[] =
{ {
".comment*", ".comment*",
".debug*", ".debug*",
".zdebug*", /* Compressed debug sections. */
".GCC-command-line", /* mn10300 */ ".GCC-command-line", /* mn10300 */
".mdebug*", /* alpha, score, mips etc. */ ".mdebug*", /* alpha, score, mips etc. */
".pdr", /* alpha, score, mips etc. */ ".pdr", /* alpha, score, mips etc. */
...@@ -1441,7 +1442,7 @@ static unsigned int *reloc_location(struct elf_info *elf, ...@@ -1441,7 +1442,7 @@ static unsigned int *reloc_location(struct elf_info *elf,
int section = shndx2secindex(sechdr->sh_info); int section = shndx2secindex(sechdr->sh_info);
return (void *)elf->hdr + sechdrs[section].sh_offset + return (void *)elf->hdr + sechdrs[section].sh_offset +
r->r_offset - sechdrs[section].sh_addr; r->r_offset;
} }
static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r) static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
......
...@@ -104,6 +104,8 @@ static int cpio_mkslink(const char *name, const char *target, ...@@ -104,6 +104,8 @@ static int cpio_mkslink(const char *name, const char *target,
char s[256]; char s[256];
time_t mtime = time(NULL); time_t mtime = time(NULL);
if (name[0] == '/')
name++;
sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
"%08X%08X%08X%08X%08X%08X%08X", "%08X%08X%08X%08X%08X%08X%08X",
"070701", /* magic */ "070701", /* magic */
...@@ -152,6 +154,8 @@ static int cpio_mkgeneric(const char *name, unsigned int mode, ...@@ -152,6 +154,8 @@ static int cpio_mkgeneric(const char *name, unsigned int mode,
char s[256]; char s[256];
time_t mtime = time(NULL); time_t mtime = time(NULL);
if (name[0] == '/')
name++;
sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
"%08X%08X%08X%08X%08X%08X%08X", "%08X%08X%08X%08X%08X%08X%08X",
"070701", /* magic */ "070701", /* magic */
...@@ -245,6 +249,8 @@ static int cpio_mknod(const char *name, unsigned int mode, ...@@ -245,6 +249,8 @@ static int cpio_mknod(const char *name, unsigned int mode,
else else
mode |= S_IFCHR; mode |= S_IFCHR;
if (name[0] == '/')
name++;
sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
"%08X%08X%08X%08X%08X%08X%08X", "%08X%08X%08X%08X%08X%08X%08X",
"070701", /* magic */ "070701", /* magic */
...@@ -303,18 +309,18 @@ static int cpio_mkfile(const char *name, const char *location, ...@@ -303,18 +309,18 @@ static int cpio_mkfile(const char *name, const char *location,
mode |= S_IFREG; mode |= S_IFREG;
retval = stat (location, &buf);
if (retval) {
fprintf (stderr, "File %s could not be located\n", location);
goto error;
}
file = open (location, O_RDONLY); file = open (location, O_RDONLY);
if (file < 0) { if (file < 0) {
fprintf (stderr, "File %s could not be opened for reading\n", location); fprintf (stderr, "File %s could not be opened for reading\n", location);
goto error; goto error;
} }
retval = fstat(file, &buf);
if (retval) {
fprintf(stderr, "File %s could not be stat()'ed\n", location);
goto error;
}
filebuf = malloc(buf.st_size); filebuf = malloc(buf.st_size);
if (!filebuf) { if (!filebuf) {
fprintf (stderr, "out of memory\n"); fprintf (stderr, "out of memory\n");
...@@ -332,6 +338,8 @@ static int cpio_mkfile(const char *name, const char *location, ...@@ -332,6 +338,8 @@ static int cpio_mkfile(const char *name, const char *location,
/* data goes on last link */ /* data goes on last link */
if (i == nlinks) size = buf.st_size; if (i == nlinks) size = buf.st_size;
if (name[0] == '/')
name++;
namesize = strlen(name) + 1; namesize = strlen(name) + 1;
sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
"%08lX%08X%08X%08X%08X%08X%08X", "%08lX%08X%08X%08X%08X%08X%08X",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment