summaryrefslogtreecommitdiffstats
path: root/core/combo/TARGET_linux-x86.mk
Commit message (Collapse)AuthorAgeFilesLines
* Include toolchain makefile based on the current config.Ying Wang2012-01-061-2/+2
| | | | | | | So we can have the same set of module names in different host arch / toolchain version combinations. Change-Id: Iec66584bf3de92aedd71a59f9dbe74b6ed025b2e
* x86: Refine the way we configure the x86 build.David 'Digit' Turner2011-12-141-27/+61
| | | | | | | | | | | | | | | | | | | | This is the result of a recent conversation around the x86 ABI and its relationship with how we build platform images. Briefly: - We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE instead of relying on explicit compiler macros like -DUSE_$FEATURE - We want to allow for other x86-based arch variants, e.g. if someone wants to build Android for a CPU that doesn't support the NDK x86 ABI. However, we need to ensure these are not tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk) - There are several flags which use is dubious now that we have a dedicated toolchain to build all the x86 stuff. Comment them as 'to be considered for removal'. We'll do the proper checks later. Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
* am 38158161: am 3343b27c: x86: The default ATOM BSP flags need to be in sync ↵Bruce Beare2011-12-121-1/+18
|\ | | | | | | | | | | | | with the NDK ABI * commit '381581613aab988acc6f9d5b459fd4f533d8c2a5': x86: The default ATOM BSP flags need to be in sync with the NDK ABI
| * x86: The default ATOM BSP flags need to be in sync with the NDK ABIBruce Beare2011-12-091-1/+18
| | | | | | | | | | Change-Id: Ic741e1795c655ace1e33ae6708219f2708358090 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | x86: enable PIE for dynamically linked executablesNick Kralevich2011-11-041-1/+2
|/ | | | | | | | | | | | | | | | | Compile all x86 programs on Android with -fPIE and -pie. This enables PIE (Position Independent Executables), which helps protect Android applications from exploitation due to memory management bugs. Note 1: PIE *static* executables are not supported at this time and require additional linker changes. Note 2: This change compliments 026a85b129e4540a4d8d40aace47aa0c69f609da, which was the exact same change, except for ARM. Testing: Rebuilt the tree completely from scratch, and verified that the system boots and basic functionality works in the emulator. Change-Id: I990064c37da3d857e663b27f31fee05f689a2824
* am a1b603a5: am 4b398749: am c5033a33: Merge "x86: remove obsolete comments"Ying Wang2011-08-291-4/+0
|\ | | | | | | | | * commit 'a1b603a556e338d4899a62ea37810aff81ab7fa1': x86: remove obsolete comments
| * am 4b398749: am c5033a33: Merge "x86: remove obsolete comments"Ying Wang2011-08-261-4/+0
| |\ | | | | | | | | | | | | * commit '4b3987498eb15dc654fe572aadf53396aac36479': x86: remove obsolete comments
| | * x86: remove obsolete commentsChih-Wei Huang2011-08-031-4/+0
| | | | | | | | | | | | Change-Id: Ifb12892c17a50f85c7700d6413ea295a4dad7047
* | | Remove the simulator target from all makefiles.Jeff Brown2011-07-111-15/+0
| | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
* | | Add .gnu_debuglink when stripping DSOs.Evgeniy Stepanov2011-06-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used by debug tools to find symbols for the stripped binary. Adds ~70 bytes to each DSO, ~25000 bytes total, which is about 0.01% of the system image. This change only affects -eng and -userdebug builds, and does not affect -user. Change-Id: I0c92a9e09fbc97184dea66813923568cbcc2a3fe
* | | Revert "x86: Enable -fstack-protector"Martijn Coenen2011-06-071-1/+3
| | | | | | | | | | | | This reverts commit e397dcccbb1bb2ed52b4d6febaee8fb900154b3e.
* | | am 0a2d335e: am c1705c9a: Merge "x86: Enable -fstack-protector"David Turner2011-06-061-3/+1
|\ \ \ | |/ / | | | | | | | | | * commit '0a2d335e99bae3c257c0e26fe180d00de04bebaa': x86: Enable -fstack-protector
| * | am c1705c9a: Merge "x86: Enable -fstack-protector"David Turner2011-06-061-3/+1
| |\ \ | | |/ | | | | | | | | | * commit 'c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6': x86: Enable -fstack-protector
| | * x86: Enable -fstack-protectorBruce Beare2011-05-261-3/+1
| | | | | | | | | | | | | | | Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | am e4778e6a: am 4272b32a: Merge "Clean up of X86 build flags"David Turner2011-06-061-2/+24
|\ \ \ | |/ / | | | | | | | | | * commit 'e4778e6ab82a40475081482f26759985deeb7f21': Clean up of X86 build flags
| * | am 4272b32a: Merge "Clean up of X86 build flags"David Turner2011-06-061-2/+24
| |\ \ | | |/ | | | | | | | | | * commit '4272b32a86bd22ce560e41816cece950a7af4e51': Clean up of X86 build flags
| | * Clean up of X86 build flagsMark D Horn2011-05-181-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review and clean-up of both compiler and linker flags to ensure proper usage and consistency for images, toolchain, SDK, and NDK. Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e Signed-off-by: Mark D Horn <mark.d.horn@intel.com> Author: Bruce Beare <bruce.j.beare@intel.com>
* | | Merge "Add LOCAL_GROUP_STATIC_LIBRARIES"Ying Wang2011-04-271-0/+4
|\ \ \ | |/ / |/| |
| * | Add LOCAL_GROUP_STATIC_LIBRARIESYing Wang2011-04-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Set LOCAL_GROUP_STATIC_LIBRARIES := true to group the static libraries, in case we need gcc flags "-Wl,--start-group" and "-Wl,--end-group" to fix circular references. Change-Id: I03c4901670112fcdd2bb0fe660b6924e5776fcf8
* | | am 6f9b7562: am d5565942: Merge "x86: Disable stack-protector until bionic ↵David Turner2011-04-261-0/+3
|\ \ \ | |/ / |/| / | |/ | | | | | | is fixed" * commit '6f9b7562e36483a7bf23833d99da6a50e57f7266': x86: Disable stack-protector until bionic is fixed
| * x86: Disable stack-protector until bionic is fixedBruce Beare2011-04-011-0/+3
| | | | | | | | | | Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | resolved conflicts for merge of db0d59d1 to honeycomb-plus-aospRaphael2011-03-251-0/+1
|\ \ | |/ | | | | Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
| * x86: the -mbionic flag is needed for IA builds.Bruce Beare2011-03-151-0/+1
| | | | | | | | | | Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | am b9c627c6: am 0683a773: Merge "x86: Use GCC 4.4.3"David Turner2011-03-071-4/+3
|\ \ | |/ | | | | | | * commit 'b9c627c6a0c6f0af57d0912175bfc739b0eb6249': x86: Use GCC 4.4.3
| * x86: Use GCC 4.4.3Bruce Beare2011-03-011-4/+3
| | | | | | | | | | | | Change-Id: I083c1afcbb98cfeb48d7bcb7681e5c34db52e767 Author: H.J. Lu <hjl.tools@gmail.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
| * Build system tweaks for Valgrind.Jeff Brown2011-02-161-7/+6
| | | | | | | | | | | | | | | | | | | | | | Added LOCAL_NO_CRT to enable building executables that do not link to the C runtime library. Removed support for LOCAL_MODULE_SUBDIR since it was broken and unused. (Was going to use it but ended up using LOCAL_MODULE_PATH instead.) Change-Id: Ifed4ffe17003d90370c711ea6606e2b75e841dee
* | Build system tweaks for Valgrind.Jeff Brown2011-02-081-7/+6
| | | | | | | | | | | | | | | | | | | | | | Added LOCAL_NO_CRT to enable building executables that do not link to the C runtime library. Removed support for LOCAL_MODULE_SUBDIR since it was broken and unused. (Was going to use it but ended up using LOCAL_MODULE_PATH instead.) Change-Id: I3b6f5ab7e5ae6aaa7119899adccece2b4ab1cbb3
* | Unify use of $(hide).Ying Wang2011-01-281-3/+3
| | | | | | | | Change-Id: Ib7e17bbb4682caecce5812e63de872b676403d64
* | Regularize use of PRIVATE_CXX.Ying Wang2011-01-271-3/+3
| | | | | | | | Change-Id: Ifc628c67b5fa142cec59187f89f2d39df81160b9
* | Correct misuse of target/host vars.Ying Wang2011-01-241-1/+1
|/ | | | Change-Id: Ide41aeddc44ca05d85a36035c2d55ea453cfd216
* resolved conflicts for merge of b2028868 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-11/+12
|\ | | | | | | Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
| * IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settingsBruce Beare2010-11-191-11/+12
| | | | | | | | | | Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the ↵Jean-Baptiste Queru2010-11-171-0/+2
|\ \ | |/ | | | | | | | | | | simulator build." * commit '48ec6d6f814a70068c4632b468cd7872f34295ad': Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
| * Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.Johnnie Birch2010-11-171-0/+2
| | | | | | | | Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
* | am cc84526b: Merge "Add atom optimization flags"Jean-Baptiste Queru2010-09-101-1/+7
|\ \ | |/ | | | | | | | | | | Merge commit 'cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22' into gingerbread-plus-aosp * commit 'cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22': Add atom optimization flags
| * Add atom optimization flagsChih-Wei Huang2010-07-261-1/+7
| | | | | | | | | | | | To enable the optimization, set TARGET_ARCH_VARIANT := x86-atom. Change-Id: I6b7798944bb8262bd83a76712419d8a77d3c34e9
* | am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbreadYing Wang2010-07-131-5/+5
|\ \ | |/ |/| | | | | | | | | Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp * commit 'f0f60cdd8f4f74b2480774887606afdebec8d891': Support to build native libraries with prebuilt NDK
| * Support to build native libraries with prebuilt NDKYing Wang2010-07-131-5/+5
| | | | | | | | | | Bug: http://b/issue?id=2811253 Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026
* | Define __ANDROID__ for x86 to be on par with ARM build requirementsBruce Beare2010-07-121-1/+1
| | | | | | | | | | Change-Id: I79c8f29af1f20b694f22a39f848216022809a5c6 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | Refactor Stripper. Allow a stripper other than SOSLIM to be specifiedBruce Beare2010-07-091-1/+3
|/ | | | | Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* Added -lpthread to target LDFLAGS for sim-eng.Andy McFadden2010-03-081-1/+1
| | | | | | | | | | This adds "-lpthread" to TARGET_GLOBAL_LDFLAGS when TARGET_SIMULATOR is true. This is much easier than inserting it into individual makefiles as needed. Has no effect on other builds. Should fix the sim-eng build breakage in libcameraservice. Change-Id: I4dcd7d54b93d1be1622b8ce78a1662d28ca9f9f2
* Tweak default x86 target arch variant.Andy McFadden2010-02-261-0/+1
| | | | Simply set the arch variant for sim-eng to be "x86".
* Build the target side of the simulator as 32-bit.Andy McFadden2010-02-241-2/+2
| | | | | | | | | This detail got lost in my previous cleanup change 9b4a812. Also add a comment explaining why the host side of the simulator needs to be built in 64-bit (wxWidgets). Change-Id: I2a867f7f80b43d53e73348b19f6ae834600295f9
* Get rid of $(combo_target)Jean-Baptiste Queru2010-02-231-0/+162
The only OS-ARCH combo that would have benefited from it is linux-x86, but it explicitly used separate configurations for the HOST_ and TARGET_ side of things. This makes is clear which files are related to the HOST_ configuration and which ones are related to the TARGET_ configuration, and expands $(combo_target) to the only possible/reasonable value that it could have had in every file. This also cleans up the simulator, by moving it in a single place in TARGET_linux_x86 (since the only part that's special is to use HOST_ settings even when building TARGET_ modules). Change-Id: I2420eeb8cfe539f5807ec99cb3177ffb9f2476d5