8079771: Fix SoundLibraries.gmk mismerge after JDK-8072665
Reviewed-by: dholmes, erikj
--- a/jdk/make/lib/SoundLibraries.gmk Wed Jul 05 20:32:48 2017 +0200
+++ b/jdk/make/lib/SoundLibraries.gmk Fri May 08 09:42:36 2015 +0200
@@ -111,10 +111,6 @@
LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES)
endif # OPENJDK_TARGET_OS solaris
-
- ifeq ($(OPENJDK_TARGET_CPU), aarch64)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
- endif
LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
--- a/jdk/src/java.desktop/share/native/libjsound/SoundDefs.h Wed Jul 05 20:32:48 2017 +0200
+++ b/jdk/src/java.desktop/share/native/libjsound/SoundDefs.h Fri May 08 09:42:36 2015 +0200
@@ -34,7 +34,6 @@
#define X_BSD 4
#define X_MACOSX 5
-#define X_AARCH64 9
// **********************************
// Make sure you set X_PLATFORM defines correctly.
// Everything depends upon this flag being setup correctly.