6718830: Hotspot fails to build with gcc 4.3
Fixed linux make file and couple adlc code to meet the changes of gcc 4.3 Reviewed-by: kamg, igor
This commit is contained in:
parent
1755a59451
commit
2c9fd9172b
@ -84,8 +84,17 @@ endif
|
||||
|
||||
# Compiler warnings are treated as errors
|
||||
WARNINGS_ARE_ERRORS = -Werror
|
||||
|
||||
# Except for a few acceptable ones
|
||||
# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
|
||||
# conversions which might affect the values. To avoid that, we need to turn
|
||||
# it off explicitly.
|
||||
ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
|
||||
ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare
|
||||
else
|
||||
ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
|
||||
endif
|
||||
|
||||
CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
|
||||
# Special cases
|
||||
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
|
||||
|
@ -29,11 +29,7 @@
|
||||
// standard library constants
|
||||
#include "stdio.h"
|
||||
#include "stdlib.h"
|
||||
#if _MSC_VER >= 1300 // Visual C++ 7.0 or later
|
||||
#include <iostream>
|
||||
#else
|
||||
#include <iostream.h>
|
||||
#endif
|
||||
#include "string.h"
|
||||
#include "ctype.h"
|
||||
#include "stdarg.h"
|
||||
|
@ -23,13 +23,9 @@
|
||||
*/
|
||||
|
||||
// FILEBUFF.HPP - Definitions for parser file buffering routines
|
||||
|
||||
#if _MSC_VER >= 1300 // Visual C++ 7.0 or later
|
||||
#include <iostream>
|
||||
#else
|
||||
#include <iostream.h>
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
// STRUCTURE FOR HANDLING INPUT AND OUTPUT FILES
|
||||
typedef struct {
|
||||
const char *_name;
|
||||
|
Loading…
Reference in New Issue
Block a user