revert: qemu changes

QEMU has been updated. Those changes should not be required anymore.

Author: mayeut

tests/replace-add-needed.sh

@@ -11,17 +11,7 @@ cp libbar.so "${SCRATCH}"/
 
 cd "${SCRATCH}"
 
-# QEMU & ldd are not playing well together in certain cases
-CHECK_QEMU=0
-libcldd=$(ldd ./simple | awk '/ => / { print $3 }' | grep -E "(libc(-[0-9.]*)*.so|ld-musl)") || CHECK_QEMU=1
-if [ "${CHECK_QEMU}" -ne 0 ]; then
-    if [ -f /lib64/libc.so.6 ] && grep qemu /proc/1/cmdline >/dev/null 2>&1; then
-        libcldd=/lib64/libc.so.6
-    else
-        echo "ldd ./simple failed"
-        exit 1
-    fi
-fi
+libcldd=$(ldd ./simple | awk '/ => / { print $3 }' | grep -E "(libc(-[0-9.]*)*.so|ld-musl)")
 
 # We have to set the soname on these libraries
 ${PATCHELF} --set-soname libbar.so ./libbar.so

tests/set-interpreter-long.sh

@@ -6,12 +6,7 @@ SCRATCH=scratch/$(basename "$0" .sh)
 oldInterpreter=$(../src/patchelf --print-interpreter ./simple)
 echo "current interpreter is $oldInterpreter"
 
-RUN_EXPLICIT_INTERPRETER=0
-if [ "$(uname)" = Linux ] && ! grep qemu /proc/1/cmdline >/dev/null 2>&1; then  # QEMU & ldd/ld.so are not playing well together in certain cases
-    RUN_EXPLICIT_INTERPRETER=1
-fi
-
-if [ "${RUN_EXPLICIT_INTERPRETER}" -ne 0 ]; then
+if test "$(uname)" = Linux; then
     echo "running with explicit interpreter..."
     "$oldInterpreter" ./simple
 fi
@@ -33,7 +28,7 @@ echo "running with new interpreter..."
 ln -s "$oldInterpreter" "$newInterpreter"
 "${SCRATCH}"/simple
 
-if [ "${RUN_EXPLICIT_INTERPRETER}" -ne 0 ]; then
+if test "$(uname)" = Linux; then
     echo "running with explicit interpreter..."
     "$oldInterpreter" "${SCRATCH}/simple"
 fi