diff src/share/tools/hsdis/Makefile @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents c9f0adfb4a8b
children 52b4284cb496
line wrap: on
line diff
--- a/src/share/tools/hsdis/Makefile	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/tools/hsdis/Makefile	Tue Apr 01 13:57:07 2014 +0200
@@ -27,7 +27,6 @@
 # Default arch; it is changed below as needed.
 ARCH		= i386
 OS		= $(shell uname)
-AR		= ar
 
 ## OS = SunOS ##
 ifeq		($(OS),SunOS)
@@ -74,7 +73,6 @@
 ifdef LP64
 CFLAGS/sparcv9	+= -m64
 CFLAGS/amd64	+= -m64
-CFLAGS/ppc64	+= -m64
 else
 ARCH=$(ARCH1:amd64=i386)
 CFLAGS/i386	+= -m32
@@ -90,20 +88,8 @@
 DLDFLAGS	+= -shared
 LDFLAGS         += -ldl
 OUTFLAGS	+= -o $@
-else
-## OS = AIX ##
-ifeq		($(OS),AIX)
-OS              = aix
-ARCH            = ppc64
-CC              = xlc_r
-CFLAGS          += -DAIX -g -qpic=large -q64
-CFLAGS/ppc64    += -q64
-AR              = ar -X64
-DLDFLAGS        += -qmkshrobj -lz
-OUTFLAGS        += -o $@
-LIB_EXT		= .so
-else
-## OS = Darwin ##
+## OS = Windows ##
+else   # !SunOS, !Linux => Darwin or Windows
 ifeq ($(OS),Darwin)
 CPU             = $(shell uname -m)
 ARCH1=$(CPU:x86_64=amd64)
@@ -127,8 +113,7 @@
 DLDFLAGS        += -lz
 LDFLAGS         += -ldl
 OUTFLAGS        += -o $@
-else
-## OS = Windows ##
+else #Windows
 OS		= windows
 CC		= gcc
 CFLAGS		+=  /nologo /MD /W3 /WX /O2 /Fo$(@:.dll=.obj) /Gi-
@@ -138,7 +123,6 @@
 OUTFLAGS	+= /link /out:$@
 LIB_EXT		= .dll
 endif   # Darwin
-endif   # AIX
 endif	# Linux
 endif	# SunOS
 
@@ -192,7 +176,7 @@
 	if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi
 
 $(TARGET_DIR)/Makefile:
-	(cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" AR="$(AR)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS))
+	(cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS))
 
 $(TARGET): $(SOURCE) $(LIBS) $(LIBRARIES) $(TARGET_DIR)
 	$(CC) $(OUTFLAGS) $(CPPFLAGS) $(CFLAGS) $(SOURCE) $(DLDFLAGS) $(LIBRARIES)