Compare commits

...

3 Commits
mcw ... bali

Author SHA1 Message Date
James Berry
9619102683 make two compiler options explicit for Visual Studio projects
This patch changes the release configuration of MS VS projects to
explicitly use two compiler options "Maximize Speed (/O2)" and
"Favor fast code(/Ot)".

This change was back ported from the master branch, with the
additional change to remove a dependency on obj_int_extract.bat

Change-Id: Ie059bdf772e0976e480503af28e1756ecf5bb9b9
2011-05-06 15:35:47 -04:00
Joshua Bleecher Snyder
86920e52ea update configure for ios sdk 4.3
update for the latest version of the ios sdk. adding
usr/lib/system fixes a missing libcache.dylib issue

make isysroot path more DRY

Change-Id: Ifd8832c0a02a514d46b9b3a466f5ebbf8a6c01a0
2011-04-21 13:44:28 -04:00
Rafael Ávila de Espíndola
98240fc76b Fix build with xcode4 and simplify GLOBAL.
Without this change I get link errors in firefox's libxul. It looks
like the linker expect a particular pattern for getting the GOT. This
patch changes webm to use the same pattern used by the compiler.

Cherry-picked from change: Iea8c2e134ad45c1dc7d221ff885a8429bfa4e057

Change-Id: I933aef1cdb5a976e6ad07618f631845de8a81ca4
2011-04-18 10:55:36 -04:00
3 changed files with 8 additions and 13 deletions

View File

@@ -729,19 +729,18 @@ process_common_toolchain() {
add_cflags -arch ${tgt_isa} add_cflags -arch ${tgt_isa}
add_ldflags -arch_only ${tgt_isa} add_ldflags -arch_only ${tgt_isa}
add_cflags "-isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk" add_cflags "-isysroot ${SDK_PATH}/SDKs/iPhoneOS4.3.sdk"
# This should be overridable # This should be overridable
alt_libc=${SDK_PATH}/SDKs/iPhoneOS4.2.sdk alt_libc=${SDK_PATH}/SDKs/iPhoneOS4.3.sdk
# Add the paths for the alternate libc # Add the paths for the alternate libc
# for d in usr/include usr/include/gcc/darwin/4.0/; do for d in usr/include usr/include/gcc/darwin/4.2/ usr/lib/gcc/arm-apple-darwin10/4.2.1/include/; do
for d in usr/include usr/include/gcc/darwin/4.0/ usr/lib/gcc/arm-apple-darwin10/4.2.1/include/; do
try_dir="${alt_libc}/${d}" try_dir="${alt_libc}/${d}"
[ -d "${try_dir}" ] && add_cflags -I"${try_dir}" [ -d "${try_dir}" ] && add_cflags -I"${try_dir}"
done done
for d in lib usr/lib; do for d in lib usr/lib usr/lib/system; do
try_dir="${alt_libc}/${d}" try_dir="${alt_libc}/${d}"
[ -d "${try_dir}" ] && add_ldflags -L"${try_dir}" [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
done done

View File

@@ -410,6 +410,8 @@ generate_vcproj() {
tag Tool \ tag Tool \
Name="VCCLCompilerTool" \ Name="VCCLCompilerTool" \
AdditionalIncludeDirectories="$incs" \ AdditionalIncludeDirectories="$incs" \
Optimization="2" \
FavorSizeorSpeed="1" \
PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;$defines" \ PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;$defines" \
RuntimeLibrary="$release_runtime" \ RuntimeLibrary="$release_runtime" \
UsePrecompiledHeader="0" \ UsePrecompiledHeader="0" \

View File

@@ -168,15 +168,10 @@
%macro GET_GOT 1 %macro GET_GOT 1
push %1 push %1
call %%get_got call %%get_got
%%sub_offset:
jmp %%exitGG
%%get_got: %%get_got:
mov %1, [esp] pop %1
add %1, fake_got - %%sub_offset
ret
%%exitGG:
%undef GLOBAL %undef GLOBAL
%define GLOBAL(x) x + %1 - fake_got %define GLOBAL(x) x + %1 - %%get_got
%undef RESTORE_GOT %undef RESTORE_GOT
%define RESTORE_GOT pop %1 %define RESTORE_GOT pop %1
%endmacro %endmacro
@@ -289,7 +284,6 @@
%elifidn __OUTPUT_FORMAT__,macho32 %elifidn __OUTPUT_FORMAT__,macho32
%macro SECTION_RODATA 0 %macro SECTION_RODATA 0
section .text section .text
fake_got:
%endmacro %endmacro
%else %else
%define SECTION_RODATA section .rodata %define SECTION_RODATA section .rodata