comparison make/sun/font/Makefile @ 8480:105d6ed3d7bd

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 20 Aug 2016 11:59:31 -0700
parents 66ad975b45a7 3d030fe77f74
children d468376d877c
comparison
equal deleted inserted replaced
35:75bf46cd298a 39:78dc7f7b729d
92 sun/font/X11TextRenderer.java \ 92 sun/font/X11TextRenderer.java \
93 sun/awt/X11GraphicsEnvironment.java 93 sun/awt/X11GraphicsEnvironment.java
94 94
95 endif # PLATFORM 95 endif # PLATFORM
96 96
97 # Turn off aliasing with GCC for ExtensionSubtables.cpp 97 # Turn off aliasing with GCC for ExtensionSubtables.cpp (and others on GCC < 4.3)
98 # Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp 98 # Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp on GCC >= 4.3
99 # Ensure signed integers wrap with GCC for IndicRearrangementProcessor.cpp on GCC < 4.3
99 ifneq (,$(findstring $(PLATFORM), bsd linux)) 100 ifneq (,$(findstring $(PLATFORM), bsd linux))
100 CXXFLAGS += $(CXXFLAGS_$(@F)) 101 CXXFLAGS += $(CXXFLAGS_$(@F))
101 CXXFLAGS_ExtensionSubtables.o = -fno-strict-aliasing 102 CXXFLAGS_ExtensionSubtables.o = -fno-strict-aliasing
103 ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
104 # GCC >= 4.3. This flag is not known in gcc 4.1.2.
102 CXXFLAGS_IndicRearrangementProcessor.o := -fno-strict-overflow 105 CXXFLAGS_IndicRearrangementProcessor.o := -fno-strict-overflow
103 CXXFLAGS_IndicRearrangementProcessor2.o := -fno-strict-overflow 106 CXXFLAGS_IndicRearrangementProcessor2.o := -fno-strict-overflow
107 else
108 CXXFLAGS_ContextualGlyphSubstProc.o = -fno-strict-aliasing
109 CXXFLAGS_IndicRearrangementProcessor.o := -fwrapv -fno-strict-aliasing
110 CXXFLAGS_IndicRearrangementProcessor2.o := -fwrapv
111 CXXFLAGS_MorphTables2.o = -fno-strict-aliasing
112 endif
104 endif 113 endif
105 114
106 #In the non-OpenJDK mode we need to build T2K 115 #In the non-OpenJDK mode we need to build T2K
107 ifndef OPENJDK 116 ifndef OPENJDK
108 t2k: 117 t2k: