diff options
| author | David S. Miller <davem@davemloft.net> | 2012-12-03 11:24:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-03 11:24:25 -0800 |
| commit | 0032c857454581510de1ca12615de5e38e543c92 (patch) | |
| tree | 2d00893831f1e1ac674d3c8dc1211d915779e006 /arch/sparc/boot/piggyback.c | |
| parent | de7531e8575ab383a0f5bb68b63e7891fce4765d (diff) | |
| download | blackbird-op-linux-0032c857454581510de1ca12615de5e38e543c92.tar.gz blackbird-op-linux-0032c857454581510de1ca12615de5e38e543c92.zip | |
sparc: Fix piggyback with newer binutils.
Newer versions of binutils mark '_end' as 'B' instead of 'A' for
whatever reason.
To be honest, the piggyback code doesn't actually care what kind
of symbol _start and _end are, it just wants to find them and
record the address.
So remove the type from the match strings.
Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/boot/piggyback.c')
| -rw-r--r-- | arch/sparc/boot/piggyback.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc/boot/piggyback.c b/arch/sparc/boot/piggyback.c index c0a798fcf030..bb7c95161d71 100644 --- a/arch/sparc/boot/piggyback.c +++ b/arch/sparc/boot/piggyback.c @@ -81,18 +81,18 @@ static void usage(void) static int start_line(const char *line) { - if (strcmp(line + 8, " T _start\n") == 0) + if (strcmp(line + 10, " _start\n") == 0) return 1; - else if (strcmp(line + 16, " T _start\n") == 0) + else if (strcmp(line + 18, " _start\n") == 0) return 1; return 0; } static int end_line(const char *line) { - if (strcmp(line + 8, " A _end\n") == 0) + if (strcmp(line + 10, " _end\n") == 0) return 1; - else if (strcmp (line + 16, " A _end\n") == 0) + else if (strcmp (line + 18, " _end\n") == 0) return 1; return 0; } @@ -100,8 +100,8 @@ static int end_line(const char *line) /* * Find address for start and end in System.map. * The file looks like this: - * f0004000 T _start - * f0379f79 A _end + * f0004000 ... _start + * f0379f79 ... _end * 1234567890123456 * ^coloumn 1 * There is support for 64 bit addresses too. |
