[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: remove use of gas-preprocessor.pl on iOS armv7

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
e10d936c by Steve Lhomme at 2022-11-29T09:41:08+00:00
contrib: remove use of gas-preprocessor.pl on iOS armv7

According to #24678 it should work with Clang 5 and above. Not sure there are
iOS/XCode toolchain still available that can target iOS 9 with an older Clang.

The iOS armv7 target continues to build assembler as before.

- - - - -
e66e2c27 by Steve Lhomme at 2022-11-29T09:41:08+00:00
package/apple: build.sh: don't force build gas-preprocessor.pl anymore

Fixes #24678

- - - - -


3 changed files:

- contrib/src/ffmpeg/rules.mak
- contrib/src/main.mak
- extras/package/apple/build.sh


Changes:

=====================================
contrib/src/ffmpeg/rules.mak
=====================================
@@ -138,9 +138,6 @@ FFMPEGCONF += --cpu=core2
 endif
 ifdef HAVE_IOS
 FFMPEGCONF += --enable-pic --extra-ldflags="$(EXTRA_CFLAGS) -isysroot $(IOS_SDK)"
-ifeq ($(ARCH),arm) # gas-preprocessor.pl
-FFMPEGCONF += --as="$(AS)"
-endif
 endif
 endif
 


=====================================
contrib/src/main.mak
=====================================
@@ -120,13 +120,6 @@ endif
 
 CCAS=$(CC) -c
 
-ifdef HAVE_IOS
-ifeq ($(ARCH),arm)
-AS=perl $(abspath $(VLC_TOOLS)/bin/gas-preprocessor.pl) $(CC)
-CCAS=gas-preprocessor.pl $(CC) -c
-endif
-endif
-
 LN_S = ln -s
 ifdef HAVE_WIN32
 MINGW_W64_VERSION := $(shell echo "__MINGW64_VERSION_MAJOR" | $(CC) $(CFLAGS) -E -include _mingw.h - | tail -n 1)


=====================================
extras/package/apple/build.sh
=====================================
@@ -582,10 +582,6 @@ echo "Building needed tools (if missing)"
 cd "$VLC_SRC_DIR/extras/tools" || abort_err "Failed cd to tools dir"
 ./bootstrap || abort_err "Bootstrapping tools failed"
 $MAKE || abort_err "Building tools failed"
-if [ $VLC_HOST_ARCH = "armv7" ]; then
-$MAKE .buildgas \
-    || abort_err "Building gas-preprocessor tool failed"
-fi
 echo ""
 
 ##########################################################



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/79d10fb8cb7271d9789c18282e2380f1fe98fc6b...e66e2c275397fc34c4e7682d48eefa3e98a99150

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/79d10fb8cb7271d9789c18282e2380f1fe98fc6b...e66e2c275397fc34c4e7682d48eefa3e98a99150
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance