1.1 --- a/src/share/tools/hsdis/Makefile Fri Jul 19 13:32:53 2013 -0700 1.2 +++ b/src/share/tools/hsdis/Makefile Fri Jul 26 10:12:15 2013 +0200 1.3 @@ -27,6 +27,7 @@ 1.4 # Default arch; it is changed below as needed. 1.5 ARCH = i386 1.6 OS = $(shell uname) 1.7 +AR = ar 1.8 1.9 ## OS = SunOS ## 1.10 ifeq ($(OS),SunOS) 1.11 @@ -73,6 +74,7 @@ 1.12 ifdef LP64 1.13 CFLAGS/sparcv9 += -m64 1.14 CFLAGS/amd64 += -m64 1.15 +CFLAGS/ppc64 += -m64 1.16 else 1.17 ARCH=$(ARCH1:amd64=i386) 1.18 CFLAGS/i386 += -m32 1.19 @@ -88,8 +90,20 @@ 1.20 DLDFLAGS += -shared 1.21 LDFLAGS += -ldl 1.22 OUTFLAGS += -o $@ 1.23 -## OS = Windows ## 1.24 -else # !SunOS, !Linux => Darwin or Windows 1.25 +else 1.26 +## OS = AIX ## 1.27 +ifeq ($(OS),AIX) 1.28 +OS = aix 1.29 +ARCH = ppc64 1.30 +CC = xlc_r 1.31 +CFLAGS += -DAIX -g -qpic=large -q64 1.32 +CFLAGS/ppc64 += -q64 1.33 +AR = ar -X64 1.34 +DLDFLAGS += -qmkshrobj -lz 1.35 +OUTFLAGS += -o $@ 1.36 +LIB_EXT = .so 1.37 +else 1.38 +## OS = Darwin ## 1.39 ifeq ($(OS),Darwin) 1.40 CPU = $(shell uname -m) 1.41 ARCH1=$(CPU:x86_64=amd64) 1.42 @@ -113,7 +127,8 @@ 1.43 DLDFLAGS += -lz 1.44 LDFLAGS += -ldl 1.45 OUTFLAGS += -o $@ 1.46 -else #Windows 1.47 +else 1.48 +## OS = Windows ## 1.49 OS = windows 1.50 CC = gcc 1.51 CFLAGS += /nologo /MD /W3 /WX /O2 /Fo$(@:.dll=.obj) /Gi- 1.52 @@ -123,6 +138,7 @@ 1.53 OUTFLAGS += /link /out:$@ 1.54 LIB_EXT = .dll 1.55 endif # Darwin 1.56 +endif # AIX 1.57 endif # Linux 1.58 endif # SunOS 1.59 1.60 @@ -176,7 +192,7 @@ 1.61 if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi 1.62 1.63 $(TARGET_DIR)/Makefile: 1.64 - (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS)) 1.65 + (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" AR="$(AR)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS)) 1.66 1.67 $(TARGET): $(SOURCE) $(LIBS) $(LIBRARIES) $(TARGET_DIR) 1.68 $(CC) $(OUTFLAGS) $(CPPFLAGS) $(CFLAGS) $(SOURCE) $(DLDFLAGS) $(LIBRARIES)