[jdk11u-dev] RFR: 8294138: [11u] Revert change from JDK-8210962 in basic.m4 [v2]

[Christoph Langer]

> Backports [JDK-8210962](https://bugs.openjdk.org/browse/JDK-8210962) completely as parts of it have already been introduced via the backport of [JDK-8239708](https://bugs.openjdk.org/browse/JDK-8239708) with this [commit](https://github.com/openjdk/jdk11u-dev/commit/75b3e45fe9d16a8e29f4fd51f93e01acc9436562#diff-9cc5f1086e5a06c7e88857b7d319eb938a76d4fb28905cb3dda3bb7493e809a7).
> 
> An alternative, if we refrain from backporting this change would be to also back out the change in basic.m4.
> 
> The backport isn't clean because the change to basics.m4/basic.m4 is already present.

Christoph Langer has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains four additional commits since the last revision:

 - Restore JDK_VARIANT
 - Merge branch 'master' into RealCLanger-backport-4c400d23
 - Revert "Backport 4c400d2372a73841f040a5913a199f7af855b56a"
   
   This reverts commit 9139d2a743994eee164ad27cd52ae99211bdd43e.
 - Backport 4c400d2372a73841f040a5913a199f7af855b56a

-------------

Changes:
  - all: https://git.openjdk.org/jdk11u-dev/pull/1368/files
  - new: https://git.openjdk.org/jdk11u-dev/pull/1368/files/9139d2a7..35da7fdc

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=1368&range=01
 - incr: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=1368&range=00-01

  Stats: 981 lines in 24 files changed: 687 ins; 130 del; 164 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/1368.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev pull/1368/head:pull/1368

PR: https://git.openjdk.org/jdk11u-dev/pull/1368