Mercurial > hg > graal-compiler
diff src/share/tools/hsdis/hsdis.c @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 89152779163c |
children |
line wrap: on
line diff
--- a/src/share/tools/hsdis/hsdis.c Thu Oct 16 10:21:29 2014 +0200 +++ b/src/share/tools/hsdis/hsdis.c Wed Oct 15 16:02:50 2014 +0200 @@ -307,7 +307,8 @@ app_data->printf_stream, app_data->printf_callback, native_bfd, - app_data->insn_options); + /* On PowerPC we get warnings, if we pass empty options */ + (caller_options == NULL) ? NULL : app_data->insn_options); /* Finish linking together the various callback blocks. */ app_data->dinfo.application_data = (void*) app_data; @@ -459,6 +460,9 @@ #ifdef LIBARCH_sparcv9 res = "sparc:v9b"; #endif +#ifdef LIBARCH_ppc64 + res = "powerpc:common64"; +#endif if (res == NULL) res = "architecture not set in Makefile!"; return res;