Mercurial > hg > graal-compiler
diff src/share/tools/hsdis/hsdis.c @ 14909:4ca6dc0799b6
Backout jdk9 merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 01 Apr 2014 13:57:07 +0200 |
parents | abec000618bf |
children | 89152779163c |
line wrap: on
line diff
--- a/src/share/tools/hsdis/hsdis.c Tue Apr 01 14:09:03 2014 +0200 +++ b/src/share/tools/hsdis/hsdis.c Tue Apr 01 13:57:07 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -307,8 +307,7 @@ app_data->printf_stream, app_data->printf_callback, native_bfd, - /* On PowerPC we get warnings, if we pass empty options */ - (caller_options == NULL) ? NULL : app_data->insn_options); + app_data->insn_options); /* Finish linking together the various callback blocks. */ app_data->dinfo.application_data = (void*) app_data; @@ -460,9 +459,6 @@ #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;