hotspot/make/bsd/makefiles/gcc.make

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2016, 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.

@@ -369,10 +369,16 @@
   CFLAGS += -DMAC_OS_X_VERSION_MAX_ALLOWED=$(subst .,,$(MACOSX_VERSION_MIN)) \
             -mmacosx-version-min=$(MACOSX_VERSION_MIN)
   LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN)
 endif
 
+# clang on OpenBSD does not support '__thread'.
+ifeq ($(USE_CLANG), true)
+  ifeq ($(OS_VENDOR), OpenBSD)
+    CFLAGS += -DUSE_LIBRARY_BASED_TLS_ONLY
+  endif
+endif
 
 #------------------------------------------------------------------------
 # Assembler flags
 
 # Enforce prerpocessing of .s files

@@ -384,11 +390,13 @@
 # statically link libstdc++.so, work with gcc but ignored by g++
 STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
 
 # Ensure use libstdc++ on clang, not libc++
 ifeq ($(USE_CLANG), true)
+  ifeq ($(OS_VENDOR), Darwin)
   LFLAGS += -stdlib=libstdc++
+  endif
 endif
 
 ifeq ($(USE_CLANG),)
   # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
   ifneq ($(CC_VER_MAJOR), 2)