Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
c3b72b7d
Commit
c3b72b7d
authored
Sep 12, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
http://linux-isdn.bkbits.net/linux-2.5.make
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
b9ca16e0
152d38aa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
58 additions
and
33 deletions
+58
-33
Makefile
Makefile
+32
-4
Rules.make
Rules.make
+22
-20
arch/ia64/Makefile
arch/ia64/Makefile
+0
-3
arch/mips64/Makefile
arch/mips64/Makefile
+1
-1
arch/sh/Makefile
arch/sh/Makefile
+1
-3
scripts/mkcompile_h
scripts/mkcompile_h
+2
-2
No files found.
Makefile
View file @
c3b72b7d
...
...
@@ -164,6 +164,9 @@ export srctree objtree
SUBDIRS
:=
init kernel mm fs ipc lib drivers sound net security
# The temporary file to save gcc -MD generated dependencies must not
# contain a comma
depfile
=
$(
subst
$(comma)
,_,
$
(
@D
)
/.
$
(
@F
)
.d
)
noconfig_targets
:=
xconfig menuconfig config oldconfig randconfig
\
defconfig allyesconfig allnoconfig allmodconfig
\
...
...
@@ -271,7 +274,7 @@ boot: vmlinux
vmlinux-objs
:=
$(HEAD)
$(INIT)
$(CORE_FILES)
$(LIBS)
$(DRIVERS)
$(NETWORKS)
quiet_cmd_link_vmlinux
=
LD
$@
quiet_cmd_link_vmlinux
=
LD
$@
cmd_link_vmlinux
=
$(LD)
$(LDFLAGS)
$
(
LDFLAGS_
$
(
@F
))
$(HEAD)
$(INIT)
\
--start-group
\
$(CORE_FILES)
\
...
...
@@ -318,8 +321,12 @@ prepare: include/linux/version.h include/asm include/config/MARKER
# This can be used by arch/$ARCH/Makefile to preprocess
# their vmlinux.lds.S file
arch/$(ARCH)/vmlinux.lds.s
:
arch/$(ARCH)/vmlinux.lds.S
$(CPP)
$(CPPFLAGS)
$
(
CPPFLAGS_
$@
)
-P
-C
-U
$(ARCH)
$<
-o
$@
AFLAGS_vmlinux.lds.o
+=
-P
-C
-U
$(ARCH)
arch/$(ARCH)/vmlinux.lds.s
:
arch/$(ARCH)/vmlinux.lds.S FORCE
$(
call
if_changed_dep,as_s_S
)
targets
+=
arch
/
$(ARCH)
/vmlinux.lds.s
# Single targets
# ---------------------------------------------------------------------------
...
...
@@ -782,13 +789,34 @@ endif # ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
# FIXME Should go into a make.lib or something
# ===========================================================================
a_flags
=
-Wp
,-MD,
$(depfile)
$(AFLAGS)
$(NOSTDINC_FLAGS)
\
$(modkern_aflags)
$(EXTRA_AFLAGS)
$
(
AFLAGS_
$
(
*
F
)
.o
)
quiet_cmd_as_s_S
=
CPP
$(echo_target)
cmd_as_s_S
=
$(CPP)
$(a_flags)
-o
$@
$<
# read all saved command lines
cmd_files
:=
$(
wildcard
.
*
.cmd
)
targets
:=
$(
wildcard
$(
sort
$(targets)
))
cmd_files
:=
$(
wildcard
.
*
.cmd
$(
foreach
f,
$(targets)
,
$(
dir
$(f)
)
.
$(
notdir
$(f)
)
.cmd
))
ifneq
($(cmd_files),)
include
$(cmd_files)
endif
# execute the command and also postprocess generated .d dependencies
# file
if_changed_dep
=
$(
if
$(
strip
$?
$(
filter-out
FORCE
$(
wildcard
$^
)
,
$^
)
\
$(
filter-out
$
(
cmd_
$(1)
)
,
$
(
cmd_
$@
))
\
$(
filter-out
$
(
cmd_
$@
)
,
$
(
cmd_
$(1)
)))
,
\
@set
-e
;
\
$(
if
$
(
$(quiet)
cmd_
$(1)
)
,echo
' $(
$(quiet)
cmd_
$(1)
)
'
;
)
\
$
(
cmd_
$(1)
)
;
\
$(TOPDIR)
/scripts/fixdep
$(depfile)
$@
$(TOPDIR)
'$(cmd_
$(1)
)
'
>
$
(
@D
)
/.
$
(
@F
)
.tmp
;
\
rm
-f
$(depfile)
;
\
mv
-f
$
(
@D
)
/.
$
(
@F
)
.tmp
$
(
@D
)
/.
$
(
@F
)
.cmd
)
# Usage: $(call if_changed_rule,foo)
# will check if $(cmd_foo) changed, or any of the prequisites changed,
# and if so will execute $(rule_foo)
...
...
Rules.make
View file @
c3b72b7d
...
...
@@ -174,7 +174,7 @@ c_flags = -Wp,-MD,$(depfile) $(CFLAGS) $(NOSTDINC_FLAGS) \
# files (fix-dep filters them), so touch modversions.h if any of the .ver
# files changes
quiet_cmd_cc_ver_c
=
MKVER include/linux/modules/
$(RELDIR)
/
$*
.ver
quiet_cmd_cc_ver_c
=
MKVER
include/linux/modules/
$(RELDIR)
/
$*
.ver
cmd_cc_ver_c
=
$(CPP)
$(c_flags)
$<
|
$(GENKSYMS)
$(genksyms_smp_prefix)
\
-k
$(VERSION)
.
$(PATCHLEVEL)
.
$(SUBLEVEL)
>
$@
.tmp
...
...
@@ -271,26 +271,26 @@ c_flags = -Wp,-MD,$(depfile) $(CFLAGS) $(NOSTDINC_FLAGS) \
-DKBUILD_BASENAME
=
$(
subst
$(comma)
,_,
$(
subst
-,_,
$
(
*
F
)))
\
$(export_flags)
quiet_cmd_cc_s_c
=
CC
$(echo_target)
quiet_cmd_cc_s_c
=
CC
$(echo_target)
cmd_cc_s_c
=
$(CC)
$(c_flags)
-S
-o
$@
$<
%.s
:
%.c FORCE
$(
call
if_changed_dep,cc_s_c
)
quiet_cmd_cc_i_c
=
CPP
$(echo_target)
quiet_cmd_cc_i_c
=
CPP
$(echo_target)
cmd_cc_i_c
=
$(CPP)
$(c_flags)
-o
$@
$<
%.i
:
%.c FORCE
$(
call
if_changed_dep,cc_i_c
)
quiet_cmd_cc_o_c
=
CC
$(echo_target)
quiet_cmd_cc_o_c
=
CC
$(echo_target)
cmd_cc_o_c
=
$(CC)
$(c_flags)
-c
-o
$@
$<
%.o
:
%.c FORCE
$(
call
if_changed_dep,cc_o_c
)
quiet_cmd_cc_lst_c
=
' Generating
$(echo_target)
'
cmd_cc_lst_c
=
$(CC)
$(c_flags)
-g
-c
-o
$*
.o
$<
&&
$(TOPDIR)
/scripts/makelst
$*
.o
$(TOPDIR)
/System.map
$(OBJDUMP)
>
$@
quiet_cmd_cc_lst_c
=
MKLST
$(echo_target)
cmd_cc_lst_c
=
$(CC)
$(c_flags)
-g
-c
-o
$*
.o
$<
&&
$(TOPDIR)
/scripts/makelst
$*
.o
$(TOPDIR)
/System.map
$(OBJDUMP)
>
$@
%.lst
:
%.c FORCE
$(
call
if_changed_dep,cc_lst_c
)
...
...
@@ -306,13 +306,13 @@ $(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE)
a_flags
=
-Wp
,-MD,
$(depfile)
$(AFLAGS)
$(NOSTDINC_FLAGS)
\
$(modkern_aflags)
$(EXTRA_AFLAGS)
$
(
AFLAGS_
$
(
*
F
)
.o
)
quiet_cmd_as_s_S
=
CPP
$(echo_target)
quiet_cmd_as_s_S
=
CPP
$(echo_target)
cmd_as_s_S
=
$(CPP)
$(a_flags)
-o
$@
$<
%.s
:
%.S FORCE
$(
call
if_changed_dep,as_s_S
)
quiet_cmd_as_o_S
=
AS
$(echo_target)
quiet_cmd_as_o_S
=
AS
$(echo_target)
cmd_as_o_S
=
$(CC)
$(a_flags)
-c
-o
$@
$<
%.o
:
%.S FORCE
...
...
@@ -330,7 +330,7 @@ $(sort $(subdir-obj-y)): sub_dirs ;
# Rule to compile a set of .o files into one .o file
#
ifdef
O_TARGET
quiet_cmd_link_o_target
=
LD
$(echo_target)
quiet_cmd_link_o_target
=
LD
$(echo_target)
# If the list of objects to link is empty, just create an empty O_TARGET
cmd_link_o_target
=
$(
if
$(
strip
$
(
obj-y
))
,
\
$(LD)
$(LDFLAGS)
$(EXTRA_LDFLAGS)
-r
-o
$@
$(
filter
$
(
obj-y
)
,
$^
)
,
\
...
...
@@ -346,7 +346,7 @@ endif # O_TARGET
# Rule to compile a set of .o files into one .a file
#
ifdef
L_TARGET
quiet_cmd_link_l_target
=
AR
$(echo_target)
quiet_cmd_link_l_target
=
AR
$(echo_target)
cmd_link_l_target
=
rm
-f
$@
;
$(AR)
$(EXTRA_ARFLAGS)
rcs
$@
$
(
obj-y
)
$(L_TARGET)
:
$(obj-y) FORCE
...
...
@@ -359,7 +359,7 @@ endif
# Rule to link composite objects
#
quiet_cmd_link_multi
=
LD
$(echo_target)
quiet_cmd_link_multi
=
LD
$(echo_target)
cmd_link_multi
=
$(LD)
$(LDFLAGS)
$(EXTRA_LDFLAGS)
-r
-o
$@
$(
filter
$
(
$(
basename
$@
)
-objs
)
,
$^
)
# We would rather have a list of rules like
...
...
@@ -381,7 +381,7 @@ host-progs-single := $(foreach m,$(host-progs),$(if $($(m)-objs),,$(m)))
host-progs-multi
:=
$(
foreach
m,
$
(
host-progs
)
,
$(
if
$
(
$(m)
-objs
)
,
$(m)
))
host-progs-multi-objs
:=
$(
foreach
m,
$
(
host-progs-multi
)
,
$
(
$(m)
-objs
))
quiet_cmd_host_cc__c
=
HOSTCC
$(echo_target)
quiet_cmd_host_cc__c
=
HOSTCC
$(echo_target)
cmd_host_cc__c
=
$(HOSTCC)
-Wp
,-MD,
$(depfile)
\
$(HOSTCFLAGS)
$(HOST_EXTRACFLAGS)
\
$(HOST_LOADLIBES)
-o
$@
$<
...
...
@@ -389,14 +389,14 @@ cmd_host_cc__c = $(HOSTCC) -Wp,-MD,$(depfile) \
$(host-progs-single)
:
%: %.c FORCE
$(
call
if_changed_dep,host_cc__c
)
quiet_cmd_host_cc_o_c
=
HOSTCC
$(echo_target)
quiet_cmd_host_cc_o_c
=
HOSTCC
$(echo_target)
cmd_host_cc_o_c
=
$(HOSTCC)
-Wp
,-MD,
$(depfile)
\
$(HOSTCFLAGS)
$(HOST_EXTRACFLAGS)
-c
-o
$@
$<
$(host-progs-multi-objs)
:
%.o: %.c FORCE
$(
call
if_changed_dep,host_cc_o_c
)
quiet_cmd_host_cc__o
=
HOSTLD
$(echo_target)
quiet_cmd_host_cc__o
=
HOSTLD
$(echo_target)
cmd_host_cc__o
=
$(HOSTCC)
$(HOSTLDFLAGS)
-o
$@
$
(
$@
-objs
)
\
$(HOST_LOADLIBES)
...
...
@@ -411,9 +411,11 @@ endif # ! fastdep
# Shipped files
# ===========================================================================
quiet_cmd_shipped
=
SHIPPED
$(echo_target)
cmd_shipped
=
cat
$<
>
$@
%
::
%_shipped
@
echo
' CP
$(echo_target)
'
@
cp
$<
$@
$(
call
cmd,shipped
)
# Commands useful for building a boot image
# ===========================================================================
...
...
@@ -421,7 +423,7 @@ endif # ! fastdep
# Use as following:
#
# target: source(s) FORCE
# $(if_changed,ld/objcopy)
# $(if_changed,ld/objcopy
/gzip
)
#
# and add target to EXTRA_TARGETS so that we know we have to
# read in the saved command line
...
...
@@ -429,20 +431,20 @@ endif # ! fastdep
# Linking
# ---------------------------------------------------------------------------
quiet_cmd_ld
=
LD
$(echo_target)
quiet_cmd_ld
=
LD
$(echo_target)
cmd_ld
=
$(LD)
$(LDFLAGS)
$(EXTRA_LDFLAGS)
$
(
LDFLAGS_
$@
)
\
$(
filter-out
FORCE,
$^
)
-o
$@
# Objcopy
# ---------------------------------------------------------------------------
quiet_cmd_objcopy
=
OBJCPY
$(echo_target)
quiet_cmd_objcopy
=
OBJC
O
PY
$(echo_target)
cmd_objcopy
=
$(OBJCOPY)
$(OBJCOPYFLAGS)
$<
$@
# Gzip
# ---------------------------------------------------------------------------
quiet_cmd_gzip
=
GZIP
$(echo_target)
quiet_cmd_gzip
=
GZIP
$(echo_target)
cmd_gzip
=
gzip
-f
-9
<
$<
>
$@
# ===========================================================================
...
...
arch/ia64/Makefile
View file @
c3b72b7d
...
...
@@ -96,9 +96,6 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
vmlinux
:
arch/$(ARCH)/vmlinux.lds.s
arch/$(ARCH)/vmlinux.lds.s
:
arch/$(ARCH)/vmlinux.lds.S
$(CPP)
$(CPPFLAGS)
$
(
CPPFLAGS_
$@
)
-D__ASSEMBLY__
-P
-C
-U
$(ARCH)
$<
-o
$@
compressed
:
vmlinux
$(OBJCOPY)
$(OBJCOPYFLAGS)
vmlinux vmlinux-tmp
gzip
vmlinux-tmp
...
...
arch/mips64/Makefile
View file @
c3b72b7d
...
...
@@ -149,7 +149,7 @@ endif
vmlinux
:
arch/mips64/vmlinux.lds.s
CPPFLAGS_arch/mips64/vmlinux.lds.s
:
= -imacros $(srctree)/include/asm-mips64/sn/mapped_kernel.h
AFLAGS_vmlinux.lds.o
:=
-imacros
$(srctree)
/include/asm-mips64/sn/mapped_kernel.h
ifdef
CONFIG_MAPPED_KERNEL
vmlinux.64
:
vmlinux
...
...
arch/sh/Makefile
View file @
c3b72b7d
...
...
@@ -72,9 +72,7 @@ endif
vmlinux
:
arch/sh/vmlinux.lds.s
CPPFLAGS_arch/sh/vmlinux.lds.s
:
= -traditional
FORCE
:
;
AFLAGS_vmlinux.lds.o
:=
-traditional
zImage
:
vmlinux
@
$(MAKEBOOT)
zImage
...
...
scripts/mkcompile_h
View file @
c3b72b7d
...
...
@@ -67,8 +67,8 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
# first line.
if [ -r $TARGET ] && \
grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' $TARGET > .tmpver.1 && \
grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' .tmpcompile > .tmpver.2 && \
grep -v '
auto generated\|
UTS_VERSION\|LINUX_COMPILE_TIME' $TARGET > .tmpver.1 && \
grep -v '
auto generated\|
UTS_VERSION\|LINUX_COMPILE_TIME' .tmpcompile > .tmpver.2 && \
cmp -s .tmpver.1 .tmpver.2; then
echo ' (unchanged)'
rm -f .tmpcompile
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment