comparison src/share/vm/runtime/os.cpp @ 17937:78bbf4d43a14

8037816: Fix for 8036122 breaks build with Xcode5/clang 8043029: Change 8037816 breaks HS build with older GCC versions which don't support diagnostic pragmas 8043164: Format warning in traceStream.hpp Summary: Backport of main fix + two corrections, enables clang compilation, turns on format attributes, corrects/mutes warnings Reviewed-by: kvn, coleenp, iveresov, twisti
author drchase
date Thu, 22 May 2014 15:52:41 -0400
parents 7384f6a12fc1
children 52b4284cb496 fa62fb12cdca
comparison
equal deleted inserted replaced
17935:7384f6a12fc1 17937:78bbf4d43a14
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
62 #ifdef TARGET_OS_FAMILY_bsd 62 #ifdef TARGET_OS_FAMILY_bsd
63 # include "os_bsd.inline.hpp" 63 # include "os_bsd.inline.hpp"
64 #endif 64 #endif
65 65
66 # include <signal.h> 66 # include <signal.h>
67
68 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
67 69
68 OSThread* os::_starting_thread = NULL; 70 OSThread* os::_starting_thread = NULL;
69 address os::_polling_page = NULL; 71 address os::_polling_page = NULL;
70 volatile int32_t* os::_mem_serialize_page = NULL; 72 volatile int32_t* os::_mem_serialize_page = NULL;
71 uintptr_t os::_serialize_page_mask = 0; 73 uintptr_t os::_serialize_page_mask = 0;
907 if (env_list) { 909 if (env_list) {
908 st->print_cr("Environment Variables:"); 910 st->print_cr("Environment Variables:");
909 911
910 for (int i = 0; env_list[i] != NULL; i++) { 912 for (int i = 0; env_list[i] != NULL; i++) {
911 if (getenv(env_list[i], buffer, len)) { 913 if (getenv(env_list[i], buffer, len)) {
912 st->print(env_list[i]); 914 st->print("%s", env_list[i]);
913 st->print("="); 915 st->print("=");
914 st->print_cr(buffer); 916 st->print_cr("%s", buffer);
915 } 917 }
916 } 918 }
917 } 919 }
918 } 920 }
919 921