Fix open64 build issue - remove libacml_mv from build

Change-Id: I07249b9bd2175028b81347b4c349423d8c4519f6

Author: mergerobot

configure

@@ -2434,8 +2434,9 @@ fi
 
 if test "${BUILD_TARGET}" = "X8664" || test "${BUILD_TARGET}" = "IA32"; then
   #LIBLIST="libopen64rt libacml_mv $LIBLIST libinstr2"
-  LIBLIST="libopen64rt libacml_mv $LIBLIST"
-  ac_config_files="$ac_config_files osprey/targdir_lib/libopen64rt/Makefile osprey/targdir_lib/libinstr2/Makefile osprey/targdir_lib/libacml_mv/Makefile"
+  # remove libacml_mv as not compilable any more
+  LIBLIST="libopen64rt $LIBLIST"
+  ac_config_files="$ac_config_files osprey/targdir_lib/libopen64rt/Makefile osprey/targdir_lib/libinstr2/Makefile"
 
 fi
 if test "${BUILD_TARGET}" = "IA64" ; then
@@ -3236,7 +3237,6 @@ do
     "osprey/targdir_lib/libu/Makefile") CONFIG_FILES="$CONFIG_FILES osprey/targdir_lib/libu/Makefile" ;;
     "osprey/targdir_lib/libopen64rt/Makefile") CONFIG_FILES="$CONFIG_FILES osprey/targdir_lib/libopen64rt/Makefile" ;;
     "osprey/targdir_lib/libinstr2/Makefile") CONFIG_FILES="$CONFIG_FILES osprey/targdir_lib/libinstr2/Makefile" ;;
-    "osprey/targdir_lib/libacml_mv/Makefile") CONFIG_FILES="$CONFIG_FILES osprey/targdir_lib/libacml_mv/Makefile" ;;
     "osprey/targdir_lib/init/Makefile") CONFIG_FILES="$CONFIG_FILES osprey/targdir_lib/init/Makefile:osprey/targdir_lib/init/Makefile.in" ;;
     "osprey/targdir_lib2/Makefile") CONFIG_FILES="$CONFIG_FILES osprey/targdir_lib2/Makefile:osprey/targdir_lib/Makefile.in" ;;
     "osprey/targdir_lib2/include/Makefile") CONFIG_FILES="$CONFIG_FILES osprey/targdir_lib2/include/Makefile:osprey/targdir_lib/include/Makefile.in" ;;

configure.ac

@@ -574,11 +574,11 @@ fi
 
 if test "${BUILD_TARGET}" = "X8664" || test "${BUILD_TARGET}" = "IA32"; then
   #LIBLIST="libopen64rt libacml_mv $LIBLIST libinstr2"
-  LIBLIST="libopen64rt libacml_mv $LIBLIST" 
+  # remove libacml_mv as not compilable any more
+  LIBLIST="libopen64rt $LIBLIST"
   AC_CONFIG_FILES([
     osprey/targdir_lib/libopen64rt/Makefile
     osprey/targdir_lib/libinstr2/Makefile
-    osprey/targdir_lib/libacml_mv/Makefile
   ])
 fi
 if test "${BUILD_TARGET}" = "IA64" ; then

osprey/driver/objects.c

@@ -402,27 +402,40 @@ add_object (int flag, char *arg)
 #ifndef BUILD_MASTIFF // do not add -lmv for MASTIFF
 			/* add -lmv -lmblah */		
 			if (xpg_flag && invoked_lang == L_f77) {
+#if 0
+// libacml_mv is not compilable as matherr is no longer
+// supported after glibc 2.27
 #ifdef TARG_X8664
 				if (abi != ABI_N32)
 					add_library(objects, "acml_mv");
+#endif
 #endif
 				add_library(lib_objects, "mv");
 				add_library(lib_objects, "m");
 			} else {
+#if 0
+// libacml_mv is not compilable as matherr is no longer
+// supported after glibc 2.27
 #ifdef TARG_X8664
 				if (abi != ABI_N32)
 					add_library(objects, "acml_mv");
 #endif
+#endif
+
 #if !defined(TARG_SL) && !defined(TARG_PPC32)   
 				add_library(objects, "mv");
 #endif
 				add_library(objects, "m");
 			}
 #if !defined(TARG_SL) && !defined(TARG_PPC32)
 			if (invoked_lang == L_CC) {
+#if 0
+// libacml_mv is not compilable as matherr is no longer
+// supported after glibc 2.27
 #ifdef TARG_X8664
 			    if (abi != ABI_N32)
 				add_library(objects, "acml_mv");
+#endif
 #endif
 			    add_library(cxx_prelinker_objects, "mv");
 			    add_library(cxx_prelinker_objects, "m");

osprey/driver/phases.c

@@ -2329,9 +2329,13 @@ add_final_ld_args (string_list_t *args, phases_t ld_phase)
 		add_string(args, "-lmv");
 	//	add_string(args, "-lm" PSC_NAME_PREFIX);
 		add_string(args, "-lm");
+#if 0
+// libacml_mv is not compilable as matherr is no longer
+// supported after glibc 2.27
 #ifdef TARG_X8664
 		if (abi != ABI_N32)
                     add_library(args, "acml_mv");
+#endif
 #endif
 		add_library(args, "mv");
 	//	add_library(args, "m" PSC_NAME_PREFIX);
@@ -2411,7 +2415,11 @@ add_final_ld_args (string_list_t *args, phases_t ld_phase)
 		 * however adding two instances of -lm only removes one.
 		 */
                 if (invoked_lang == L_CC)
+#if 0
+		// libacml_mv is not compilable as matherr is no longer
+		// supported after glibc 2.27
 		add_library(args, "acml_mv");
+#endif
 		  add_library(args, "m");
               }
 #endif