Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/intel-openmp/Makefile
changeset 7771 46912a8a1f29
parent 6923 338aea22bf22 
--- a/components/intel-openmp/Makefile	Fri Jan 27 16:34:13 2017 -0800
+++ b/components/intel-openmp/Makefile	Wed Mar 08 22:04:29 2017 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 export PARFAIT_BUILD=no
@@ -28,9 +28,8 @@
 
 include ../../make-rules/shared-macros.mk
 
-# We are using GCC 4.9 with LLVM, use it here too for the time being.
-# Switch to GCC 5.3 if/when LLVM can.
-GCC_ROOT=/usr/gcc/4.9
+# This and llvm must use the same version of gcc.
+GCC_ROOT=/usr/gcc/5
 
 COMPONENT_NAME        = libomp
 COMPONENT_VERSION     = 20151009
@@ -44,8 +43,6 @@
 
 TPNO = 27154
 
-BUILD_STYLE = justmake
-
 # Uses an ON header file with S12-only features.
 ifeq ($(BUILD_TYPE), evaluation)
 BUILD_32_and_64=
@@ -53,6 +50,11 @@
 PUBLISH_STAMP=
 endif
 
+# There are no tests for this version of the Intel OpenMP Library
+# OpenMP tests will be integrated in ${WS_TOP}/components/bots.
+BUILD_STYLE = cmake
+CMAKE_BUILD_TYPE = Release
+TEST_TARGET = $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
 
 export PATH=/usr/gnu/bin:$(GCC_ROOT)/bin:/usr/bin:/usr/perl5/5.22/bin
@@ -60,30 +62,18 @@
 PATCH_LEVEL := 0
 DEBUG_BUILD := 0
 
-# This component uses cmake to generate Makefiles and thus does not
-# run any configure script
-CMAKE = /usr/bin/cmake
-CMAKE_PREFIX = /usr
-
-CMAKE_BINDIR.32     = bin/$(MACH32)
-CMAKE_BINDIR.64     = bin
-CMAKE_LIBDIR.32     = lib
-CMAKE_LIBDIR.64     = lib/$(MACH64)
-
-ISA_CFLAGS.i386	= -fno-omit-frame-pointer -march=opteron -mtune=opteron
-ISA_CFLAGS.sparc = -mptr$(BITS) -mtune=ultrasparc3 -mcpu=ultrasparc3
-ISA_CFLAGS.sparc += -mvis2 -mhard-float -mno-unaligned-doubles
-ISA_CFLAGS.sparc += -mimpure-text
-ISA_CFLAGS = $(ISA_CFLAGS.$(MACH))
+CFLAGS += -fno-omit-frame-pointer
+CFLAGS.gcc.i386  += -march=opteron -mtune=opteron
+CFLAGS.gcc.sparc += -mtune=ultrasparc3 -mcpu=ultrasparc3
+CFLAGS.gcc.sparc += -mvis2 -mhard-float -mno-unaligned-doubles
+CFLAGS.gcc.sparc += -mimpure-text
 
 OMP_STATS = off
-OFLAG = -O2
 GFLAG =
 DFLAG = -DNDEBUG
 
 ifeq ($(DEBUG_BUILD),1)
   OMP_STATS = on
-  OFLAG = -O0
   GFLAG = -g3
   DFLAG =
 endif
@@ -92,19 +82,19 @@
 # we can't pass a -std=<N> on compile line. This is done internally
 # by the cmake configuration files.
 # The Userland default flags for GCC are broken.
-CFLAGS = -m$(BITS) $(OFLAG) $(GFLAG) $(ISA_CFLAGS) -Wall
+CFLAGS += $(GFLAG) $(DFLAG) -Wall
 CFLAGS += -fkeep-static-consts -fno-strict-aliasing
 
-CXXFLAGS = -m$(BITS) $(OFLAG) $(GFLAG) $(ISA_CFLAGS) -Wall
+CXXFLAGS += $(GFLAG) $(DFLAG) -Wall
 CXXFLAGS += -fkeep-static-consts -fno-strict-aliasing
 CXXFLAGS += -Wl,-z -Wl,relax=comdat
 
-CPPFLAGS = -D__EXTENSIONS__=1 -DKMP_GOMP_COMPAT=1
+CPPFLAGS += -D__EXTENSIONS__=1 -DKMP_GOMP_COMPAT=1
 CPPFLAGS += -DKMP_TDATA_GTID=1
 LDFLAGS += -z ignore -z relax=comdat
 
-LIBIOMP_RUNPATH_32	= /usr/gcc/4.9/lib
-LIBIOMP_RUNPATH_64	= /usr/gcc/4.9/lib/$(MACH64)
+LIBIOMP_RUNPATH_32	= /usr/gcc/5/lib
+LIBIOMP_RUNPATH_64	= /usr/gcc/5/lib/$(MACH64)
 LIBIOMP_RUNPATH	= $(LIBIOMP_RUNPATH_$(BITS))
 
 CFLAGS		+= -Wl,-R -Wl,$(LIBIOMP_RUNPATH)
@@ -112,20 +102,9 @@
 LDFLAGS		+= -R$(LIBIOMP_RUNPATH)
 LD_OPTIONS	= -z ignore -z relax=comdat
 
-CMAKE_OPTIONS = -DCMAKE_C_COMPILER=$(CC)
-CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX)
-CMAKE_OPTIONS += -DCFLAGS="$(CPPFLAGS) $(CFLAGS)"
-CMAKE_OPTIONS += -DCXXFLAGS="$(CPPFLAGS) $(CXXFLAGS)"
-CMAKE_OPTIONS += -DLDFLAGS="$(LDFLAGS)"
-CMAKE_OPTIONS += -DCMAKE_INSTALL_PREFIX=$(CMAKE_PREFIX)
-CMAKE_OPTIONS += -DINSTALL_LIBDIR:PATH=$(CMAKE_LIBDIR)
-CMAKE_OPTIONS += -DCMAKE_INSTALL_LIBDIR:PATH=$(CMAKE_LIBDIR)
 CMAKE_OPTIONS += -DCMAKE_MAKE_PROGRAM=$(GMAKE)
 CMAKE_OPTIONS += -DCMAKE_SHARED_LIBRARY_SUFFIX=".so.5"
 
-CMAKE_OPTIONS += -DCMAKE_C_FLAGS_RELEASE:STRING="$(OFLAG) $(GFLAG) $(DFLAG)"
-CMAKE_OPTIONS += -DCMAKE_CXX_FLAGS_RELEASE:STRING="$(OFLAG) $(GFLAG) $(DFLAG)"
-
 CMAKE_OPTIONS += -DCMAKE_VERBOSE_MAKEFILE=1
 CMAKE_OPTIONS += -DCOMPILER_SUPPORTS_QUAD_PRECISION=true
 CMAKE_OPTIONS += -DDEBUG_BUILD=false
@@ -136,7 +115,6 @@
 CMAKE_OPTIONS += -DLIBOMP_FORTRAN_MODULES=true
 CMAKE_OPTIONS += -DLIBOMP_VERSION=5
 CMAKE_OPTIONS += -DLIBOMP_OMP_VERSION=41
-CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=release
 
 COMPONENT_BUILD_ENV += LD_OPTIONS="$(LD_OPTIONS)"
 
@@ -145,25 +123,14 @@
 COMPONENT_POST_UNPACK_ACTION = \
       $(MV) libomp_oss $(COMPONENT_SRC)
 
-COMPONENT_PRE_BUILD_ACTION += cd $(@D);
-COMPONENT_PRE_BUILD_ACTION += echo Running cmake with $(CMAKE_OPTIONS) ;
-COMPONENT_PRE_BUILD_ACTION += /usr/bin/env - $(COMPONENT_BUILD_ENV) \
-			      $(CMAKE) $(CMAKE_OPTIONS) . ;
-
-build: $(BUILD_32_and_64)
-
-install: $(INSTALL_32_and_64)
-
-# There are no tests for this version of the Intel OpenMP Library
-# OpenMP tests will be integrated in ${WS_TOP}/components/bots.
-test: $(NO_TESTS)
-
-system-test:    $(NO_TESTS)
-
 REQUIRED_PACKAGES += developer/build/cmake
-REQUIRED_PACKAGES += developer/gcc-4/gcc-common-49
+REQUIRED_PACKAGES += developer/build/pkg-config
+REQUIRED_PACKAGES += developer/gcc/gcc-c++-5
+REQUIRED_PACKAGES += developer/gcc/gcc-c-5
+REQUIRED_PACKAGES += developer/gcc/gcc-common-5
+REQUIRED_PACKAGES += developer/gnu-binutils
 REQUIRED_PACKAGES += system/core-os
-REQUIRED_PACKAGES += system/library/gcc/gcc-runtime-49
-REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime-49
-REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime-49
+REQUIRED_PACKAGES += system/library/gcc/gcc-runtime-5
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime-5
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime-5
 REQUIRED_PACKAGES += system/library/math
upstream/oracle/userland-gate