--- old/make/lib/SoundLibraries.gmk 2015-02-09 18:49:18.676341700 +0400 +++ new/make/lib/SoundLibraries.gmk 2015-02-09 18:49:18.507332000 +0400 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -113,39 +113,6 @@ LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES) endif # OPENJDK_TARGET_OS solaris - -ifeq ($(JVM_VARIANT_ZERO), true) - LIBJSOUND_CFLAGS += -DX_ARCH=X_ZERO -else - ifeq ($(OPENJDK_TARGET_CPU), x86) - LIBJSOUND_CFLAGS += -DX_ARCH=X_I586 - endif - - ifeq ($(OPENJDK_TARGET_CPU), sparc) - LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARC - endif - - ifeq ($(OPENJDK_TARGET_CPU), sparcv9) - LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARCV9 - endif - - ifeq ($(OPENJDK_TARGET_CPU), x86_64) - LIBJSOUND_CFLAGS += -DX_ARCH=X_AMD64 - endif - - ifeq ($(OPENJDK_TARGET_CPU), arm) - LIBJSOUND_CFLAGS += -DX_ARCH=X_ARM - endif - - ifeq ($(OPENJDK_TARGET_CPU), ppc) - LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC - endif - - ifeq ($(OPENJDK_TARGET_CPU), ppc64) - LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64 - endif -endif - LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"' $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \ --- old/make/mapfiles/libjsound/mapfile-vers 2015-02-09 18:49:20.262417900 +0400 +++ new/make/mapfiles/libjsound/mapfile-vers 2015-02-09 18:49:20.098408500 +0400 @@ -68,7 +68,6 @@ Java_com_sun_media_sound_Platform_nGetExtraLibraries; Java_com_sun_media_sound_Platform_nGetLibraryForFeature; Java_com_sun_media_sound_Platform_nIsBigEndian; - Java_com_sun_media_sound_Platform_nIsSigned8; Java_com_sun_media_sound_PortMixer_nClose; Java_com_sun_media_sound_PortMixer_nControlGetFloatValue; Java_com_sun_media_sound_PortMixer_nControlGetIntValue; --- old/src/java.desktop/share/classes/com/sun/media/sound/Platform.java 2015-02-09 18:49:21.859496400 +0400 +++ new/src/java.desktop/share/classes/com/sun/media/sound/Platform.java 2015-02-09 18:49:21.692486800 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,13 +64,6 @@ // SYSTEM CHARACTERISTICS // vary according to hardware architecture - // signed8 (use signed 8-bit values) is true for everything we support except for - // the solaris sbpro card. - // we'll leave it here as a variable; in the future we may need this in java. - // wait, is that true? i'm not sure. i think solaris takes unsigned data? - // $$kk: 03.11.99: i think solaris takes unsigned 8-bit or signed 16-bit data.... - private static boolean signed8; - // intel is little-endian. sparc is big-endian. private static boolean bigEndian; @@ -110,14 +103,6 @@ } - /** - * Determine whether the system takes signed 8-bit data. - */ - static boolean isSigned8() { - - return signed8; - } - // PRIVATE METHODS /** @@ -185,17 +170,14 @@ // the following native methods are implemented in Platform.c private native static boolean nIsBigEndian(); - private native static boolean nIsSigned8(); private native static String nGetExtraLibraries(); private native static int nGetLibraryForFeature(int feature); - /** * Read the required system properties. */ private static void readProperties() { // $$fb 2002-03-06: implement check for endianness in native. Facilitates porting ! bigEndian = nIsBigEndian(); - signed8 = nIsSigned8(); // Solaris on Sparc: signed, all others unsigned } } --- old/src/java.desktop/share/native/libjsound/Platform.c 2015-02-09 18:49:23.435573700 +0400 +++ new/src/java.desktop/share/native/libjsound/Platform.c 2015-02-09 18:49:23.272564400 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,19 +39,6 @@ } /* - * Class: com_sun_media_sound_Platform - * Method: nIsSigned8 - * Signature: ()Z - */ -JNIEXPORT jboolean JNICALL Java_com_sun_media_sound_Platform_nIsSigned8(JNIEnv *env, jclass clss) { -#if ((X_ARCH == X_SPARC) || (X_ARCH == X_SPARCV9)) - return 1; -#else - return 0; -#endif -} - -/* * Class: com_sun_media_sound_Platform * Method: nGetExtraLibraries * Signature: ()Ljava/lang/String; --- old/src/java.desktop/share/native/libjsound/SoundDefs.h 2015-02-09 18:49:25.018646400 +0400 +++ new/src/java.desktop/share/native/libjsound/SoundDefs.h 2015-02-09 18:49:24.848638900 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,32 +34,13 @@ #define X_BSD 4 #define X_MACOSX 5 -// types for X_ARCH -#define X_I586 1 -#define X_SPARC 2 -#define X_SPARCV9 3 -#define X_IA64 4 -#define X_AMD64 5 -#define X_ZERO 6 -#define X_ARM 7 -#define X_PPC 8 - // ********************************** -// Make sure you set X_PLATFORM and X_ARCH defines correctly. +// Make sure you set X_PLATFORM defines correctly. // Everything depends upon this flag being setup correctly. // ********************************** -#if (X_PLATFORM == X_MACOSX) && !defined(X_ARCH) -#if __x86_64__ -#define X_ARCH X_AMD64 -#endif -#if __i386__ -#define X_ARCH X_I586 -#endif -#endif - -#if (!defined(X_PLATFORM) || !defined(X_ARCH)) -#error "You need to define X_PLATFORM and X_ARCH outside of the source. Use the types above." +#if (!defined(X_PLATFORM)) +#error "You need to define X_PLATFORM outside of the source. Use the types above." #endif