src/jdk.pack200/share/native/common-unpack/utils.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2011, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2015, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 75,94 ****
--- 75,97 ----
    MKDIR(dir);
  }
  
  
  #ifndef PRODUCT
+ #ifndef STATIC_BUILD
+ // use the definition in libjvm when building statically
  void breakpoint() { }  // hook for debugger
  int assert_failed(const char* p) {
    char message[1<<12];
    sprintf(message, "@assert failed: %s\n", p);
    fprintf(stdout, "%s", 1+message);
    breakpoint();
    unpack_abort(message);
    return 0;
  }
  #endif
+ #endif
  
  void unpack_abort(const char* msg, unpacker* u) {
    if (msg == null)  msg = "corrupt pack file or internal error";
    if (u == null)
      u = unpacker::current();