diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-22 14:09:08 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-22 14:09:08 -0700 |
| commit | aa349c0a96998f651f246581c395069343e3e008 (patch) | |
| tree | 8f04ac2049a7629100745c331dc569c1f067b062 /scripts | |
| parent | 8e4f993802d3d853d5377b9aaa8df28926140077 (diff) | |
| parent | 85184740541c2b80b72ebfa46cfe065ec1d1058f (diff) | |
Merge tag 'v4.4.19' into android-4.4.y
This is the 4.4.19 stable release
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/recordmcount.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index e167592793a7..42396a74405d 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c @@ -33,10 +33,17 @@ #include <string.h> #include <unistd.h> +/* + * glibc synced up and added the metag number but didn't add the relocations. + * Work around this in a crude manner for now. + */ #ifndef EM_METAG -/* Remove this when these make it to the standard system elf.h. */ #define EM_METAG 174 +#endif +#ifndef R_METAG_ADDR32 #define R_METAG_ADDR32 2 +#endif +#ifndef R_METAG_NONE #define R_METAG_NONE 3 #endif |