This is an archive of the discontinued LLVM Phabricator instance.

Differential D56927

Disable PIC/PIE for MSP430 target
ClosedPublic

Authored by dmikushin on Jan 18 2019, 12:03 PM.

Details

Reviewers
asl
Commits
rGa39eb26bd3f1: Disable PIC/PIE for MSP430 target
rC353877: Disable PIC/PIE for MSP430 target
rL353877: Disable PIC/PIE for MSP430 target
rG56bf7b56dcb2: Disable PIC/PIE for MSP430 target by default.
rL352181: Disable PIC/PIE for MSP430 target by default.
rC352181: Disable PIC/PIE for MSP430 target by default.
Summary

Relocatable code generation is meaningless on MSP430, as the platform is too small to use shared libraries.

Diff Detail

Repository
rL LLVM

Event Timeline

dmikushin created this revision.Jan 18 2019, 12:03 PM
Herald added a subscriber: cfe-commits. · View Herald TranscriptJan 18 2019, 12:03 PM
grimar added a subscriber: grimar.Jan 19 2019, 10:15 AM

Can it be tested with a test case?

dmikushin updated this revision to Diff 183214.Jan 23 2019, 5:11 PM

Adding test case

asl accepted this revision.Jan 25 2019, 1:41 AM
This revision is now accepted and ready to land.Jan 25 2019, 1:41 AM
Closed by commit rC352181: Disable PIC/PIE for MSP430 target by default. (authored by asl). · Explain WhyJan 25 2019, 1:42 AM
This revision was automatically updated to reflect the committed changes.
asl reopened this revision.Jan 25 2019, 2:37 AM

The patch was reverted – the test requires fully configured msp430 configuration and therefore was breaking the bots.

This revision is now accepted and ready to land.Jan 25 2019, 2:37 AM
asl requested changes to this revision.Jan 25 2019, 2:37 AM

Please make sure the test passes.

This revision now requires changes to proceed.Jan 25 2019, 2:37 AM
dmikushin updated this revision to Diff 184118.Jan 29 2019, 10:11 AM

Unbreaking patch by providing an appropriate toolchain requirement

Harbormaster completed remote builds in B27455: Diff 184118.Jan 29 2019, 10:11 AM
grimar added a comment.Jan 30 2019, 1:56 AM

What I noticed, this seems to introduce the first test case in test\CodeGen\MSP430 folder which uses clang. All the others use llc. Is it OK?

grimar added a comment.EditedJan 30 2019, 2:05 AM

Oh sorry, I looked in the wrong folder, my previous comment was not correct.

So, this patch adds a test to test\CodeGen when we have test\CodeGen\MSP430 folder.
And test\CodeGen does not have any tests now at all.
So I guess the correct way would probably be:

  1. To move the test to test\CodeGen\MSP430 folder.
  2. To make it use 'llc`.
grimar added a comment.Jan 30 2019, 2:14 AM

Ok, please ignore my comments above. I applied the patch and found it creates the test in llvm\tools\clang\test\CodeGen and not in llvm\test\CodeGen. Was confused by phab, sorry for the noise.

asl accepted this revision.Feb 12 2019, 12:44 PM
This revision is now accepted and ready to land.Feb 12 2019, 12:44 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 12 2019, 12:44 PM
Herald added a subscriber: jdoerfert. · View Herald Transcript
Closed by commit rL353877: Disable PIC/PIE for MSP430 target (authored by asl). · Explain WhyFeb 12 2019, 12:45 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 12 2019, 12:45 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
cfe/
trunk/
lib/
Driver/
ToolChains/
4 lines
test/
CodeGen/
30 lines

Diff 186532

cfe/trunk/lib/Driver/ToolChains/MSP430.h

Show All 30 Lines MSP430ToolChain(const Driver &D, const llvm::Triple &Triple,
const llvm::opt::ArgList &Args); const llvm::opt::ArgList &Args);
void void
AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const override; llvm::opt::ArgStringList &CC1Args) const override;
void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs, void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args, llvm::opt::ArgStringList &CC1Args,
Action::OffloadKind) const override; Action::OffloadKind) const override;
bool isPICDefault() const override { return false; }
bool isPIEDefault() const override { return false; }
bool isPICDefaultForced() const override { return true; }
protected: protected:
Tool *buildLinker() const override; Tool *buildLinker() const override;
private: private:
std::string computeSysRoot() const; std::string computeSysRoot() const;
}; };
} // end namespace toolchains } // end namespace toolchains
Show All 24 Lines

cfe/trunk/test/CodeGen/msp430-reloc.c

// REQUIRES: msp430-registered-target
// RUN: %clang -target msp430 -fPIC -S %s -o - | FileCheck %s
// Check the compilation does not crash as it was crashing before with "-fPIC" enabled
void *alloca(unsigned int size);
// CHECK: .globl foo
short foo(char** data, char encoding)
{
char* encoding_addr = alloca(sizeof(char));
*encoding_addr = encoding;
char tmp3 = *encoding_addr;
short conv2 = tmp3;
short and = conv2 & 0xf;
switch (and)
{
case 0 :
case 4 :
case 10 :
return 1;
case 11 :
return 2;
}
return 0;
}