[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: configure: use $host_cpu where applicable

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
d78ca74e by Rémi Denis-Courmont at 2024-11-13T10:30:09+00:00
configure: use $host_cpu where applicable

(cherry picked from commit a50366bc9702ad4ec0db1e5361bcea8378bf8132)

- - - - -
64e09957 by Steve Lhomme at 2024-11-13T10:30:09+00:00
configure: enable large-address-aware on 32-bit Windows

This allows the GPU drivers to use more memory than a 32-bit app would use.
This should have no effect on a 32-bit Windows.

Fixes #28743

(cherry picked from commit 616d1a05b1011450bae637b029c98eec071a26eb) (edited)
edited:
- 3.0 doesn't have armv7 configuration variables
- 3.0 doesn't have X86ASMFLAGS/X86ASMDEFS

- - - - -


1 changed file:

- configure.ac


Changes:

=====================================
configure.ac
=====================================
@@ -144,8 +144,8 @@ case "${host_os}" in
 
     dnl Force gcc "-arch" flag
     ARCH_flag=""
-    case "${host}" in
-      i?86*)
+    case "${host_cpu}" in
+      i?86)
         ARCH_flag="-arch i386"
       ;;
       ppc64*)
@@ -154,7 +154,7 @@ case "${host_os}" in
       ppc*)
         ARCH_flag="-arch ppc"
       ;;
-      x86_64*)
+      x86_64)
         ARCH_flag="-arch x86_64"
       ;;
       arm*)
@@ -287,16 +287,20 @@ case "${host_os}" in
         dnl
         dnl NSIS/MSI Installer prefix and WIN64
         dnl
-        case "${host}" in
-            amd64*|x86_64*)
+        case "${host_cpu}" in
+            amd64|x86_64)
                 HAVE_WIN64="1"
                 WINDOWS_ARCH="x64"
                 PROGRAMFILES="PROGRAMFILES64"
                 LDFLAGS="${LDFLAGS} -Wl,--high-entropy-va -Wl,--image-base,0x140000000"
             ;;
-            *)
+            i?86)
                 WINDOWS_ARCH="x86"
                 PROGRAMFILES="PROGRAMFILES"
+                AX_APPEND_FLAG([-Wl,--large-address-aware], [LDFLAGS])
+            ;;
+            *)
+                AC_MSG_ERROR([Unsupported Windows architecture ${host_cpu}])
             ;;
         esac
         AC_SUBST(WINDOWS_ARCH)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4a56da187dd7a09daa92279f02572163404d2bdd...64e099576f908ad29205cd77a7dd1f0ea8053447

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4a56da187dd7a09daa92279f02572163404d2bdd...64e099576f908ad29205cd77a7dd1f0ea8053447
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance