From 8188f4b2afa274066ea559b8d114baac6271df2e Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 20 Sep 2009 18:14:12 -0400 Subject: [PATCH] --- yaml --- r: 165581 b: refs/heads/master c: 42f29a25207dc7b3051d299cc028d4b395d1328d h: refs/heads/master i: 165579: bb8fff96e4912e546f384be307645e47e6cf2d0e v: v3 --- [refs] | 2 +- trunk/include/linux/linkage.h | 2 ++ trunk/scripts/Makefile.build | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f3704c673842..907f62540bc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51b563fc93c8cb5bff1d67a0a71c374e4a4ea049 +refs/heads/master: 42f29a25207dc7b3051d299cc028d4b395d1328d diff --git a/trunk/include/linux/linkage.h b/trunk/include/linux/linkage.h index 691f59171c6c..5126cceb6ae9 100644 --- a/trunk/include/linux/linkage.h +++ b/trunk/include/linux/linkage.h @@ -57,6 +57,7 @@ #ifdef __ASSEMBLY__ +#ifndef LINKER_SCRIPT #define ALIGN __ALIGN #define ALIGN_STR __ALIGN_STR @@ -66,6 +67,7 @@ ALIGN; \ name: #endif +#endif /* LINKER_SCRIPT */ #ifndef WEAK #define WEAK(name) \ diff --git a/trunk/scripts/Makefile.build b/trunk/scripts/Makefile.build index d5425660a3df..341b58902ffc 100644 --- a/trunk/scripts/Makefile.build +++ b/trunk/scripts/Makefile.build @@ -271,7 +271,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(always) # --------------------------------------------------------------------------- quiet_cmd_cpp_lds_S = LDS $@ cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \ - -D__ASSEMBLY__ -o $@ $< + -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $< $(obj)/%.lds: $(src)/%.lds.S FORCE $(call if_changed_dep,cpp_lds_S)