[PATCH] fix modpost warnings for xtensa
The Xtensa architecture places literal pools in sections separate
from the instructions. The corresponsing text sections, therefore,
reference the .literal section, and we have to suppress those
warnings. The naming convention defines the name for a literal
section as .SECTION.literal, unless .SECTION is .text. In that case
the name is only .literal. Using strncmp() instead of strcmp()
to compare the from-section with .SECTION.init.refok in pattern 0
should not cause any regressions for other architectures.
We also need to suppress warnings for two informational
sections (.xt.lit and .xt.prop) used by the Xtensa architecture.
Signed-off-by: Chris Zankel <[EMAIL PROTECTED]>
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 3645e98..9061443 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -645,12 +645,20 @@ static int strrcmp(const char *s, const char *sub)
* powerpc has a machine desc table for each platform.
* It is mixture of function pointers of .init.text and .text.
* fromsec = .machvec | .machine.desc
+ *
+ * Pattern 11:
+ * Xtensa uses literal sections for constants that are accessed PC-relative.
+ * Literal sections may savely reference their text sections.
+ * (Note that the name for the literal section omits any trailing '.text')
+ * tosec = <section>[.text]
+ * fromsec = <section>.literal
**/
static int secref_whitelist(const char *modname, const char *tosec,
const char *fromsec, const char *atsym,
const char *refsymname)
{
int f1 = 1, f2 = 1;
+ int len;
const char **s;
const char *pat2sym[] = {
"driver",
@@ -672,8 +680,10 @@ static int secref_whitelist(const char *modname, const
char *tosec,
};
/* Check for pattern 0 */
- if ((strcmp(fromsec, ".text.init.refok") == 0) ||
- (strcmp(fromsec, ".data.init.refok") == 0))
+ if ((strncmp(fromsec, ".text.init.refok",
+ strlen(".text.init.refok")) == 0) ||
+ (strncmp(fromsec, ".data.init.refok",
+ strlen(".data.init.refok")) == 0))
return 1;
/* Check for pattern 1 */
@@ -733,6 +743,16 @@ static int secref_whitelist(const char *modname, const
char *tosec,
(strcmp(fromsec, ".machine.desc") == 0))
return 1;
+
+ /* Check for pattern 11 */
+ len = strlen(tosec) - strlen(".text");
+ if (len <= 0 || strcmp(tosec + len, ".text") != 0)
+ len = strlen(tosec);
+ if (strncmp(tosec, fromsec, len) == 0
+ && (strlen(fromsec) > len)
+ && (strcmp(fromsec + len, ".literal") == 0))
+ return 1;
+
return 0;
}
@@ -858,10 +878,9 @@ static void warn_sec_mismatch(const char *modname, const
char *fromsec,
if (refsym && strlen(elf->strtab + refsym->st_name))
refsymname = elf->strtab + refsym->st_name;
- /* check whitelist - we may ignore it */
- if (before &&
- secref_whitelist(modname, secname, fromsec,
- elf->strtab + before->st_name, refsymname))
+ if (secref_whitelist(modname, secname, fromsec,
+ before ? elf->strtab + before->st_name : "",
+ refsymname))
return;
/* fromsec whitelist - without a valid 'before'
@@ -1053,6 +1072,8 @@ static int init_section_ref_ok(const char *name)
"__ftr_fixup", /* powerpc cpu feature fixup */
"__fw_ftr_fixup", /* powerpc firmware feature fixup */
".cranges", /* used by sh64 */
+ ".xt.prop", /* xtensa informational section */
+ ".xt.lit", /* xtensa informational section */
NULL
};
/* Start of section names */
@@ -1134,6 +1155,8 @@ static int exit_section_ref_ok(const char *name)
".smp_locks",
".plt", /* seen on ARCH=um build on x86_64. Harmless */
".cranges", /* used by sh64 */
+ ".xt.prop", /* xtensa informational section */
+ ".xt.lit", /* xtensa informational section */
NULL
};
/* Start of section names */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
