hrev52320 adds 3 changesets to branch 'master'
old head: bd234de11cc79859e348993018c6101df94e519d
new head: f960901a70ae7835f8f4968ba825e1bca56f7b1f
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=f960901a70ae+%5Ebd234de11cc7
----------------------------------------------------------------------------
23446707de8e: ArchitectureRules: Pass -shared to the universally to the linker
when using Clang.
e282a54db855: BUrl: Remove HAIKU_TARGET_PLATFORM_HAIKU from main header.
These are really only defined during the build of Haiku itself,
so we don't want them in a system header. Since none of these
functions are virtual, leaving them as declared but not defined
should be fine.
f960901a70ae: EFI: Use proper mnemnoic for retf (lret) to appease Clang.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 4 insertions(+), 7 deletions(-)
build/jam/ArchitectureRules | 3 ++-
headers/os/support/Url.h | 4 ----
src/system/boot/platform/efi/smp_trampoline.S | 4 ++--
############################################################################
Commit: 23446707de8ecb843698123544cf6fb005ad7c65
URL: https://git.haiku-os.org/haiku/commit/?id=23446707de8e
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Sep 5 04:06:59 2018 UTC
ArchitectureRules: Pass -shared to the universally to the linker when using
Clang.
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 07bd79e646..a7db33126d 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -52,8 +52,9 @@ rule ArchitectureSetup architecture
case x86 : archFlags += -march=pentium ;
}
if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
- # TODO: This should be included in Clang's compiler specs.
+ # TODO: These should be included in Clang's compiler specs.
archFlags += -fPIC ;
+ HAIKU_LINKFLAGS_$(architecture) += -shared ;
}
ccBaseFlags += $(archFlags) ;
############################################################################
Commit: e282a54db8554c892fb8fd3e9b4220b7781178f2
URL: https://git.haiku-os.org/haiku/commit/?id=e282a54db855
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Sep 8 22:43:44 2018 UTC
BUrl: Remove HAIKU_TARGET_PLATFORM_HAIKU from main header.
These are really only defined during the build of Haiku itself,
so we don't want them in a system header. Since none of these
functions are virtual, leaving them as declared but not defined
should be fine.
----------------------------------------------------------------------------
diff --git a/headers/os/support/Url.h b/headers/os/support/Url.h
index 31f8d971bb..b6e37148d4 100644
--- a/headers/os/support/Url.h
+++ b/headers/os/support/Url.h
@@ -64,10 +64,8 @@ public:
void UrlEncode(bool strict =
false);
void UrlDecode(bool strict =
false);
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
status_t IDNAToAscii();
status_t IDNAToUnicode();
-#endif
// Url encoding/decoding of strings
static BString UrlEncode(const BString& url,
@@ -76,13 +74,11 @@ public:
static BString UrlDecode(const BString& url,
bool
strict = false);
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
// utility functionality
bool
HasPreferredApplication() const;
BString PreferredApplication()
const;
status_t
OpenWithPreferredApplication(
bool
onProblemAskUser = true) const;
-#endif
// BArchivable members
virtual status_t Archive(BMessage* into,
############################################################################
Revision: hrev52320
Commit: f960901a70ae7835f8f4968ba825e1bca56f7b1f
URL: https://git.haiku-os.org/haiku/commit/?id=f960901a70ae
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Sep 8 22:44:49 2018 UTC
EFI: Use proper mnemnoic for retf (lret) to appease Clang.
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/efi/smp_trampoline.S
b/src/system/boot/platform/efi/smp_trampoline.S
index 48cebf493f..54b5dfcf38 100644
--- a/src/system/boot/platform/efi/smp_trampoline.S
+++ b/src/system/boot/platform/efi/smp_trampoline.S
@@ -46,7 +46,7 @@ smp_trampoline_args:
pushl %eax
.byte 0x66
.code32
- retf
+ lret
trampoline_32:
mov $0x10, %ax
@@ -88,7 +88,7 @@ trampoline_32:
pushl $KERNEL_CODE_SELECTOR
leal (.Llmode - smp_trampoline)(%ebx), %eax
pushl %eax
- retf
+ lret
.align 8
.code64
.Llmode:
